[6448] end of sentence in @w

[Gavin D. Smith]

Revision: 6448
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6448
Author:   gavin
Date:     2015-07-22 13:01:05 +0000 (Wed, 22 Jul 2015)
Log Message:
-----------
end of sentence in @w

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-22 10:57:04 UTC (rev 6447)
+++ trunk/ChangeLog     2015-07-22 13:01:05 UTC (rev 6448)
@@ -1,5 +1,10 @@
 2015-07-22  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/mylib/xspara.c (xspara_add_text):
+       Remove space doubling at end of sentence within a @w.
+
+2015-07-22  Gavin Smith  <address@hidden>
+
        * doc/texinfo.texi (Writing A Menu): Move node before "Menu 
        Location" node.
        (Menus, Menu Location): Move advice on writing short nodes to 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-22 10:57:04 UTC 
(rev 6447)
+++ trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-22 13:01:05 UTC 
(rev 6448)
@@ -790,35 +790,8 @@
                         *ptr = ' ';
                       ptr++;
                     }
-
-                  /* TODO: Get rid of !state.french_spacing.  This is needed
-                     when Plaintext.pm passed in a non-French spacing end
-                     sentence via add_text, used by @? and similar. */
-                  if (state.end_sentence == 1 && !state.french_spacing)
-                    { // 347
-                      /* Make the space at the end of the word up to
-                         two spaces. */
-
-                      /* However, other spaces within a @w aren't doubled.
-                         For example,
-
-                           soffv. gvrtg. rgger. @w{hello. hello.
-                           more here.}
-
-                         outputs
-
-                           soffv.  gvrtg.  rgger.  hello. hello.  more here.
-
-                       */
-
-                      if (ptr == state.word.text + 1 || !isspace(ptr[-2]))
-                        {
-                          text_append_n (&state.word, " ", 1);
-                        }
-                      /* Note that that doesn't check for any
-                         fancy spaces. */
-                    }
                 }
+
               if (state.counter != 0
                   && state.counter + state.word_counter + state.space_counter
                      > state.max)