texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[6388] always output ...


From: Gavin D. Smith
Subject: [6388] always output ...
Date: Sat, 04 Jul 2015 15:52:52 +0000

Revision: 6388
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6388
Author:   gavin
Date:     2015-07-04 15:52:50 +0000 (Sat, 04 Jul 2015)
Log Message:
-----------
always output ... for @dots{}

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
    trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-04 13:59:24 UTC (rev 6387)
+++ trunk/ChangeLog     2015-07-04 15:52:50 UTC (rev 6388)
@@ -1,5 +1,13 @@
 2015-07-04  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/Plaintext.pm (_convert) <brace commands 
+       with no arguments>: Don't call 
+       Texinfo::Convert::Text::brace_no_arg_command for @dots or 
+       @enddots, to prevent the Unicode ellipsis character from being 
+       used.
+
+2015-07-04  Gavin Smith  <address@hidden>
+
        * tp/Makefile.am,
        * tp/tests/htmlxref/Makefile.am,
        * tp/tests/htmlxref-only_mono/Makefile.am,

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-04 13:59:24 UTC (rev 
6387)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-04 15:52:50 UTC (rev 
6388)
@@ -1767,8 +1767,13 @@
     } elsif (exists($brace_no_arg_commands{$root->{'cmdname'}})) {
       my $text;
       
-      $text = Texinfo::Convert::Text::brace_no_arg_command($root, 
-                                         $self->{'convert_text_options'});
+      if ($command eq 'dots' or $command eq 'enddots') {
+        # Don't use Unicode ellipsis character.
+        $text = '...';
+      } else {
+        $text = Texinfo::Convert::Text::brace_no_arg_command($root, 
+                                           $self->{'convert_text_options'});
+      }
 
       # @AA{} should suppress an end sentence, @aa{} shouldn't.  This
       # is the case whether we are in @sc or not.

Modified: 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
--- 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2015-07-04 13:59:24 UTC (rev 6387)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2015-07-04 15:52:50 UTC (rev 6388)
@@ -12,7 +12,7 @@
 *     ! 
  .  . ? @::
 * @ { } \ #::
-* LaTeX TeX • , © … ...::
+* LaTeX TeX • , © ... ...::
 * ≡ error→ € ¡ ↦ −::
 * ≥ ≤ →::
 * ª º ★ £ ⊣ ¿ ®::
@@ -53,20 +53,20 @@
 ***************
 
 
-File: at_commands_in_refs_utf8.info,  Node: @ { } \ #,  Next: LaTeX TeX • , © 
… ...,  Prev:     !
+File: at_commands_in_refs_utf8.info,  Node: @ { } \ #,  Next: LaTeX TeX • , © 
... ...,  Prev:     !
 . . ? @,  Up: Top
 
 3 @ { } \ #
 ***********
 
 
-File: at_commands_in_refs_utf8.info,  Node: LaTeX TeX • , © … ...,  Next: ≡ 
error→ € ¡ ↦ −,  Prev: @ { } \ #,  Up: Top
+File: at_commands_in_refs_utf8.info,  Node: LaTeX TeX • , © ... ...,  Next: ≡ 
error→ € ¡ ↦ −,  Prev: @ { } \ #,  Up: Top
 
-4 LaTeX TeX • , © … ...
-***********************
+4 LaTeX TeX • , © ... ...
+*************************
 
 
-File: at_commands_in_refs_utf8.info,  Node: ≡ error→ € ¡ ↦ −,  Next: ≥ ≤ →,  
Prev: LaTeX TeX • , © … ...,  Up: Top
+File: at_commands_in_refs_utf8.info,  Node: ≡ error→ € ¡ ↦ −,  Next: ≥ ≤ →,  
Prev: LaTeX TeX • , © ... ...,  Up: Top
 
 5 ≡ error→ € ¡ ↦ −
 ******************
@@ -207,8 +207,8 @@
 *note { }::
 
    *note     !
-. . ? @:: *note @ { } \ #:: *note LaTeX TeX • , © … ...:: *note ≡ error→
-€ ¡ ↦ −::
+. . ? @:: *note @ { } \ #:: *note LaTeX TeX • , © ... ...:: *note ≡
+error→ € ¡ ↦ −::
 
    *note ≥ ≤ →::
 
@@ -230,30 +230,30 @@
 Node:     !
 . . ? @1100
 Node: @ { } \ #1234
-Node: LaTeX TeX • , © … ...1383
-Node: ≡ error→ € ¡ ↦ −1575
-Node: ≥ ≤ →1765
-Node: ª º ★ £ ⊣ ¿ ®1924
-Node: ⇒ ° a b a sunny day å2100
-Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ2317
-Node: ä ẽ î â à é ç ē e̊ e̋ ę2569
-Node: ė ĕ e̲ ẹ ě j ee͡2809
-Node: ı Ḕ Ḉ2999
-Node: “ ” ‘ ’ „ ‚3155
-Node: « » « » ‹ ›3326
-Node: `` '' --- -- ` '3499
-Node: AAA (fff) AAA BBB3670
-Node: CCC (rrr) CCC DDD3839
-Node: the someone <address@hidden> <address@hidden>4041
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4370
-Node:  @ {} . 4749
-Node: ‘cite asis’ in @w b in r SC *str* t VAR “dfn” i4993
-Node: ‘env’ ‘code’ ‘option’ ‘samp’ ‘command’ ‘file’ ‘C-x <ESC>’5328
-Node: 8.27in5701
-Node: sansserif slanted5906
-Node: ‘indicateurl’6065
-Node: _{g}H 3^{rd}6226
-Node: <http://somewhere_aaa> text (url) ls6400
+Node: LaTeX TeX • , © ... ...1383
+Node: ≡ error→ € ¡ ↦ −1577
+Node: ≥ ≤ →1767
+Node: ª º ★ £ ⊣ ¿ ®1926
+Node: ⇒ ° a b a sunny day å2102
+Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ2319
+Node: ä ẽ î â à é ç ē e̊ e̋ ę2571
+Node: ė ĕ e̲ ẹ ě j ee͡2811
+Node: ı Ḕ Ḉ3001
+Node: “ ” ‘ ’ „ ‚3157
+Node: « » « » ‹ ›3328
+Node: `` '' --- -- ` '3501
+Node: AAA (fff) AAA BBB3672
+Node: CCC (rrr) CCC DDD3841
+Node: the someone <address@hidden> <address@hidden>4043
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4372
+Node:  @ {} . 4751
+Node: ‘cite asis’ in @w b in r SC *str* t VAR “dfn” i4995
+Node: ‘env’ ‘code’ ‘option’ ‘samp’ ‘command’ ‘file’ ‘C-x <ESC>’5330
+Node: 8.27in5703
+Node: sansserif slanted5908
+Node: ‘indicateurl’6067
+Node: _{g}H 3^{rd}6228
+Node: <http://somewhere_aaa> text (url) ls6402
 
 End Tag Table
 

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2015-07-04 13:59:24 UTC (rev 6387)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2015-07-04 15:52:50 UTC (rev 6388)
@@ -22778,12 +22778,12 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ":46: warning: address@hidden name should not contain `,': 
LaTeX TeX \x{2022} , \x{a9} \x{2026} ...
+    'error_line' => ":46: warning: address@hidden name should not contain `,': 
LaTeX TeX \x{2022} , \x{a9} ... ...
 ",
     'file_name' => '',
     'line_nr' => 46,
     'macro' => '',
-    'text' => "address@hidden name should not contain `,': LaTeX TeX \x{2022} 
, \x{a9} \x{2026} ...",
+    'text' => "address@hidden name should not contain `,': LaTeX TeX \x{2022} 
, \x{a9} ... ...",
     'type' => 'warning'
   },
   {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]