[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7208] * tp/Texinfo/Structuring.pm (nodes_tree): Refer to
|
From: |
gavinsmith0123 |
|
Subject: |
[7208] * tp/Texinfo/Structuring.pm (nodes_tree): Refer to |
|
Date: |
Thu, 9 Jun 2016 19:51:51 +0000 (UTC) |
Revision: 7208
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7208
Author: gavin
Date: 2016-06-09 19:51:51 +0000 (Thu, 09 Jun 2016)
Log Message:
-----------
* 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.
Modified Paths:
--------------
trunk/ChangeLog
trunk/README-hacking
trunk/configure.ac
trunk/doc/texinfo-tex-test.texi
trunk/doc/texinfo.tex
trunk/doc/version-stnd.texi
trunk/doc/version.texi
trunk/tp/Texinfo/Structuring.pm
trunk/tp/t/test_utils.pl
trunk/util/htmlxref.cnf
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/ChangeLog 2016-06-09 19:51:51 UTC (rev 7208)
@@ -1,3 +1,11 @@
+2016-06-09 Gavin Smith <address@hidden>
+
+ * 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 <address@hidden>
* doc/texinfo.tex (\dopdfoutline): For display string for PDF
Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/README-hacking 2016-06-09 19:51:51 UTC (rev 7208)
@@ -86,7 +86,6 @@
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
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/configure.ac 2016-06-09 19:51:51 UTC (rev 7208)
@@ -18,7 +18,7 @@
AC_CONFIG_AUX_DIR([build-aux])
dnl tar-ustar because we have long filenames for some test files.
dnl parallel-tests as recommended by stefano.
-AM_INIT_AUTOMAKE([1.14 dist-xz
+AM_INIT_AUTOMAKE([1.14
info-in-builddir parallel-tests readme-alpha tar-ustar])
# Where to generate output; srcdir location.
Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/doc/texinfo-tex-test.texi 2016-06-09 19:51:51 UTC (rev 7208)
@@ -695,8 +695,23 @@
defined value in index entry (this should definitely work)
@axindex @value{auxvalue} in index entry
+value in index entry, but only defined afterwards
address@hidden @value{definedafter} index entry
+
address@hidden @b{another}
+
+some more text.
+
address@hidden
+
address@hidden definedafter Defining this now
address@hidden definedafter Defining this again
+
@printindex ax
+
address@hidden @code{@@set} and @code{@@value}
+
@section Another test of @t{@@value}
Underscores and hyphens in value
@@ -745,12 +760,15 @@
Backslash address@hidden
Copyrite @copyright{} address@hidden
+
þ þ þ þ þ þ þ þ
@end copying
Now for the @@insertcopying:
address@hidden
@insertcopying
address@hidden
@section Captions
Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/doc/texinfo.tex 2016-06-09 19:51:51 UTC (rev 7208)
@@ -1205,6 +1205,31 @@
be supported due to the design of the PDF format; use regular TeX (DVI
output) for that.)}
+% Used for UTF-16BE in outline entries
+\newif \ifwritingtooutlineone
+\writingtooutlineonefalse
+\newif \ifwritingtooutlinetwo
+\writingtooutlinetwofalse
+
+\def\swap#1#2{#2#1}
+
+%
+% Pass a control sequence name containing UTF-8.
+\def\convertutfsixteen#1{%
+ \expandafter\convertutfsixteenxx #1\finish}
+{\catcode0=12 %
+\gdef\convertutfsixteenxx#1{%
+ \ifx#1\finish\else
+ \if\noexpand#1\relax
+ % it's a control sequence
+ #1\expandafter\swap\expandafter\convertutfsixteenxx
+ \else
+ % it's a character
+ ^^00#1\expandafter\swap\expandafter\convertutfsixteenxx
+ \fi\fi}}
+
+
+
\ifpdf
%
% Color manipulation macros using ideas from pdfcolor.tex,
@@ -1368,12 +1393,19 @@
\passthroughcharstrue
\fi
\ifx \declaredencoding \utfeight
- % TODO: the PDF format can use UTF-16 in bookmark strings, but the
- % code for this isn't done yet.
+ \writingtooutlineonetrue
+ \writingtooutlinetwofalse
\fi
\globaldefs=1
\edef\pdfoutlinetext{#1}%
\txiescapepdf\pdfoutlinetext
+ \ifx \declaredencoding \utfeight
+ \writingtooutlineonefalse
+ \writingtooutlinetwotrue
+ \edef\pdfoutlinetext{%
+ \convertutfsixteen\pdfoutlinetext}%
+ \edef\pdfoutlinetext{\pdfbom\pdfoutlinetext}
+ \fi
\egroup
%
\pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
@@ -10243,6 +10275,8 @@
\fi
}
+\def\swaggle#1#2#3{#2#3#1}
+
% Give non-ASCII bytes the active definitions for processing UTF-8 sequences
\begingroup
\catcode`\~13
@@ -10326,6 +10360,16 @@
\def\UTFviiiFourOctetsName#1#2#3#4{%
\csname u8:#1\string #2\string #3\string #4\endcsname}%
+{
+\catcode`\^^ff=12 %
+\catcode`\^^fe=12 %
+\gdef\pdfbom{^^fe^^ff}}
+
+\def\expandaftergroup#1#2{\expandaftergroupxx#2{#1}}
+\def\expandaftergroupxx#1#2{\expandafter\expandaftergroupxxx#1{#2}}
+\def\expandaftergroupxxx#1#2{#2#1}
+%
+%
% For UTF-8 byte sequence (TeX, e-TeX and pdfTeX)
% Definition macro to replace the Unicode character
% Definition macro that is used by @U command
@@ -10338,7 +10382,10 @@
\catcode`\;=12
\catcode`\!=12
\catcode`\~=13
+ \catcode`\^^00=12
\gdef\DeclareUnicodeCharacterUTFviii#1#2{%
+ \DeclareUnicodeCharacterUTFviiixx{#1}{#2}#1}%
+ \gdef\DeclareUnicodeCharacterUTFviiixx#1#2#3#4#5#6{%
\countUTFz = "#1\relax
\begingroup
\parseXMLCharref
@@ -10353,7 +10400,39 @@
\expandafter\expandafter
\expandafter\expandafter
\expandafter\expandafter
- \expandafter\gdef \UTFviiiTmp{#2}%
+ \expandafter\gdef
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter\seqname
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter{\UTFviiiTmp}%
+
+ \def\definethesequence##1##2##3{%
+ \gdef##1{%
+ \ifwritingtooutlineone
+ \noexpand##1%
+ \else\ifwritingtooutlinetwo
+ ##2##3%
+ \else
+ #2%
+ \fi\fi
+ }}%
+
+ \uccode`\X="#3#4
+ \uccode`\Y="#5#6
+ \ifnum\uccode`\X=0 %
+ \uppercase{%
+ \expandafter\definethesequence\seqname ^^00Y}%
+ \else\ifnum\uccode`\Y=0 %
+ \uppercase{%
+ \expandafter\definethesequence\seqname X^^00}%
+ \else
+ \uppercase{%
+ \expandafter\definethesequence\seqname XY}%
+ \fi\fi
%
\expandafter\ifx\csname uni:#1\endcsname \relax \else
\message{Internal error, already defined: #1}%
Modified: trunk/doc/version-stnd.texi
===================================================================
--- trunk/doc/version-stnd.texi 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/doc/version-stnd.texi 2016-06-09 19:51:51 UTC (rev 7208)
@@ -1,4 +1,4 @@
@set UPDATED 6 February 2016
@set UPDATED-MONTH February 2016
address@hidden EDITION 6.1
address@hidden VERSION 6.1
address@hidden EDITION 6.1dev
address@hidden VERSION 6.1dev
Modified: trunk/doc/version.texi
===================================================================
--- trunk/doc/version.texi 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/doc/version.texi 2016-06-09 19:51:51 UTC (rev 7208)
@@ -1,4 +1,4 @@
address@hidden UPDATED 6 February 2016
address@hidden UPDATED 20 February 2016
@set UPDATED-MONTH February 2016
address@hidden EDITION 6.1
address@hidden VERSION 6.1
address@hidden EDITION 6.1dev
address@hidden VERSION 6.1dev
Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/tp/Texinfo/Structuring.pm 2016-06-09 19:51:51 UTC (rev 7208)
@@ -585,7 +585,7 @@
$self->{'TOP_NODE_UP'});
$top_node_up
= {'type' => 'top_node_up',
- 'extra' => Texinfo::Parser::_parse_node_manual(
+ 'extra' => Texinfo::Common::parse_node_manual(
{'contents' => $top_node_up_content_tree->{'contents'}})};
}
if ($node->{'menus'}) {
Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/tp/t/test_utils.pl 2016-06-09 19:51:51 UTC (rev 7208)
@@ -374,7 +374,7 @@
my $test_name = shift;
my $trimmed = remove_keys($compared, $deleted_keys);
no warnings 'recursion';
- cmp_deeply($trimmed, $reference, $test_name);
+ Test::Deep::cmp_deeply($trimmed, $reference, $test_name);
}
sub new_test($;$$$)
Modified: trunk/util/htmlxref.cnf
===================================================================
--- trunk/util/htmlxref.cnf 2016-06-09 19:45:52 UTC (rev 7207)
+++ trunk/util/htmlxref.cnf 2016-06-09 19:51:51 UTC (rev 7208)
@@ -597,9 +597,6 @@
texinfo mono ${TEXINFO}/texinfo/texinfo.html
texinfo node ${TEXINFO}/texinfo/html_node/
#
- info mono ${TEXINFO}/info/info.html
- info node ${TEXINFO}/info/html_node/
- #
info-stnd mono ${TEXINFO}/info-stnd/info-stnd.html
info-stnd node ${TEXINFO}/info-stnd/html_node/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7208] * tp/Texinfo/Structuring.pm (nodes_tree): Refer to,
gavinsmith0123 <=