[5294] sync

[karl]

Revision: 5294
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5294
Author:   karl
Date:     2013-08-10 15:30:19 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/build-aux/texinfo.tex
    trunk/tp/MANIFEST
    trunk/util/dir-example

Modified: trunk/build-aux/texinfo.tex
===================================================================
--- trunk/build-aux/texinfo.tex 2013-08-10 11:13:33 UTC (rev 5293)
+++ trunk/build-aux/texinfo.tex 2013-08-10 15:30:19 UTC (rev 5294)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2013-02-01.11}
+\def\texinfoversion{2013-08-09.09}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2377,8 +2377,10 @@
   \ifx\next,%
   \else\ifx\next-%
   \else\ifx\next.%
+  \else\ifx\next\.%
+  \else\ifx\next\comma%
   \else\ptexslash
-  \fi\fi\fi
+  \fi\fi\fi\fi\fi
   \aftersmartic
 }
 
@@ -2475,14 +2477,14 @@
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
+% (But see \codedashfinish below.)
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 %
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-%  -- rms.
+% and arrange explicitly to hyphenate at a dash. -- rms.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
@@ -2499,14 +2501,35 @@
      \let-\normaldash
      \let_\realunder
     \fi
+    % Given -foo (with a single dash), we do not want to allow a break
+    % after the hyphen.
+    \global\let\codedashprev=\codedash
+    %
     \codex
   }
+  %
+  \gdef\codedash{\futurelet\next\codedashfinish}
+  \gdef\codedashfinish{%
+    \normaldash % always output the dash character itself.
+    % 
+    % Now, output a discretionary to allow a line break, unless
+    % (a) the next character is a -, or
+    % (b) the preceding character is a -.
+    % E.g., given --posix, we do not want to allow a break after either -.
+    % Given --foo-bar, we do want to allow a break between the - and the b.
+    \ifx\next\codedash \else
+      \ifx\codedashprev\codedash 
+      \else \discretionary{}{}{}\fi
+    \fi
+    % we need the space after the = for the case when \next itself is a
+    % space token; it would get swallowed otherwise.  As in @code{- a}.
+    \global\let\codedashprev= \next
+  }
 }
-
+\def\normaldash{-}
+%
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\normaldash{-}
-\def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @address@hidden can work.  In math mode, _
   % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
@@ -4211,9 +4234,10 @@
 
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
+% 
+% To get the special treatment we need for address@hidden ifset,' we call
+% \makecond and then redefine.
 %
-% To get special treatment of address@hidden ifset,' call \makeond and the 
redefine.
-%
 \makecond{ifset}
 \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
 \def\doifset#1#2{%
@@ -6402,7 +6426,7 @@
 \newdimen\nonfillparindent
 \def\nonfillstart{%
   \aboveenvbreak
-  \hfuzz = 12pt % Don't be fussy
+  \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output

Modified: trunk/tp/MANIFEST
===================================================================
--- trunk/tp/MANIFEST   2013-08-10 11:13:33 UTC (rev 5293)
+++ trunk/tp/MANIFEST   2013-08-10 15:30:19 UTC (rev 5294)
@@ -388,6 +388,7 @@
 t/results/converters_tests/documentencoding_utf8_and_insertions.pl
 t/results/converters_tests/email_table_command_as_argument.pl
 t/results/converters_tests/empty_accent.pl
+t/results/converters_tests/enumerate_above_ten.pl
 t/results/converters_tests/footnote_no_number.pl
 t/results/converters_tests/footnote_no_number_separate.pl
 t/results/converters_tests/image_extension.pl
@@ -507,6 +508,7 @@
 t/results/coverage_braces/footnote_in_command_not_closed.pl
 t/results/coverage_braces/footnote_no_node.pl
 t/results/coverage_braces/footnote_not_closed.pl
+t/results/coverage_braces/form_feed_in_brace_commands.pl
 t/results/coverage_braces/format_on_first_footnote_line.pl
 t/results/coverage_braces/heading_in_footnote.pl
 t/results/coverage_braces/inforef_too_much_args.pl
@@ -572,6 +574,7 @@
 t/results/def/wrong_braces_simple.pl
 t/results/def/wrong_braces_with_end_of_lines.pl
 t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
+t/results/docbook_tests/special_docbook_unnumbered.pl
 t/results/float/anchor_in_caption.pl
 t/results/float/cindex_in_caption.pl
 t/results/float/comment_space_comand_in_float.pl
@@ -849,6 +852,7 @@
 t/results/macro/empty_macro_no_arg.pl
 t/results/macro/expand_two_same.pl
 t/results/macro/expansion_order.pl
+t/results/macro/form_feeds.pl
 t/results/macro/ifclear_in_macro.pl
 t/results/macro/ifset_and_end_isef_in_macro.pl
 t/results/macro/ifset_in_macro.pl
@@ -1277,7 +1281,9 @@
 t/results/value/comment_on_set_line.pl
 t/results/value/empty_set.pl
 t/results/value/empty_value_in_line.pl
+t/results/value/not_only_characters.pl
 t/results/value/set_flag_command_equivalent.pl
+t/results/value/set_form_feed.pl
 t/results/value/set_in_item_missing_line.pl
 t/results/value/set_on_item_line.pl
 t/results/value/simple.pl

Modified: trunk/util/dir-example
===================================================================
--- trunk/util/dir-example      2013-08-10 11:13:33 UTC (rev 5293)
+++ trunk/util/dir-example      2013-08-10 15:30:19 UTC (rev 5294)
@@ -64,6 +64,7 @@
 * Cpio: (cpio).                 Copy-in-copy-out archiver to tape or disk.
 * Shar utilities: (sharutils).  Shell archiver, uuencode/uudecode.
 * Tar: (tar).                   Making tape (or disk) archives.
+* Xorrecord: (xorrecord).       Emulates CD/DVD/BD program cdrecord
 * Xorriso: (xorriso).           Burns ISO 9660 on CD, DVD, BD.
 * Xorrisofs: (xorrisofs).       Emulates ISO 9660 program mkisofs