[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Wed, 25 Oct 2023 09:22:43 -0400 (EDT) |
branch: master
commit 5747fd507ef9f99e16e2437ec9cb940381553acc
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Oct 25 14:10:26 2023 +0100
* tp/Texinfo/Convert/ParagraphNonXS.pm (add_text),
* tp/Texinfo/XS/xspara.c (xspara_add_text):
Unconditionally use a single space character to separate words in
the output when not at the end of a sentence, rather than using
the whitespace character from the input.
---
ChangeLog | 8 ++++++++
tp/Texinfo/Convert/ParagraphNonXS.pm | 6 +-----
tp/Texinfo/XS/xspara.c | 12 ++----------
tp/t/results/converters_tests/form_feeds.pl | 8 ++++----
tp/t/results/moresectioning/only_special_spaces_node.pl | 14 +++++++-------
tp/t/results/moresectioning/special_spaces_in_nodes.pl | 10 +++++-----
.../all_spaces/res_plaintext/all_spaces.txt | 6 +++---
.../sectioning/in_menu_only_special_ascii_spaces_node.pl | 8 ++++----
.../in_menu_only_special_ascii_spaces_node_menu.pl | 8 ++++----
.../results/sectioning/in_menu_only_special_spaces_node.pl | 14 +++++++-------
.../sectioning/in_menu_only_special_spaces_node_menu.pl | 14 +++++++-------
11 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9c97a98a3f..39c8eff1e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-10-25 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/ParagraphNonXS.pm (add_text),
+ * tp/Texinfo/XS/xspara.c (xspara_add_text):
+ Unconditionally use a single space character to separate words in
+ the output when not at the end of a sentence, rather than using
+ the whitespace character from the input.
+
2023-10-25 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo.texi (Conventions)
diff --git a/tp/Texinfo/Convert/ParagraphNonXS.pm
b/tp/Texinfo/Convert/ParagraphNonXS.pm
index df99d91b04..36fdef3aa0 100644
--- a/tp/Texinfo/Convert/ParagraphNonXS.pm
+++ b/tp/Texinfo/Convert/ParagraphNonXS.pm
@@ -359,11 +359,7 @@ sub add_text($$)
} else {
# Only save the first space
if (length($paragraph->{'space'}) < 1) {
- if ($spaces =~ /\n/) {
- $paragraph->{'space'} = ' ';
- } else {
- $paragraph->{'space'} .= substr ($spaces, 0, 1);
- }
+ $paragraph->{'space'} = ' ';
}
}
}
diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
index c7d507811e..703f669d1b 100644
--- a/tp/Texinfo/XS/xspara.c
+++ b/tp/Texinfo/XS/xspara.c
@@ -1064,16 +1064,8 @@ xspara_add_text (char *text, int len)
/* Only save the first space. */
if (state.space_counter < 1)
{
- if (*p == '\n')
- {
- text_append_n (&state.space, " ", 1);
- state.space_counter++;
- }
- else
- {
- text_append_n (&state.space, p, 1);
- state.space_counter++;
- }
+ text_append_n (&state.space, " ", 1);
+ state.space_counter++;
}
}
}
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 44f0fa12b0..37586e7e1e 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1406,13 +1406,13 @@ $result_converted{'plaintext'}->{'form_feeds'} = 'aa
dd
- ‘end in code ’
+ ‘end in code ’
- ‘ begin in code’
+ ‘ begin in code’
- ‘middle in code’
+ ‘middle in code’
- *Note chap node::
+ *Note chap node::
in example
diff --git a/tp/t/results/moresectioning/only_special_spaces_node.pl
b/tp/t/results/moresectioning/only_special_spaces_node.pl
index dab44580a0..6a2c7e634b 100644
--- a/tp/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tp/t/results/moresectioning/only_special_spaces_node.pl
@@ -944,11 +944,11 @@ File: , Node: , Next: , Prev: Top, Up: Top
1 EN QUAD| | EM QUAD| | EN SPACE| |
***********************************
-2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
-******************************************************
+2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
+*********************************************************
-3 CARRIAGE RETURN|'."\r".'|
-*******************
+3 CARRIAGE RETURN| |
+********************
File: , Node:
, Next: , Prev: , Up: Top
@@ -973,9 +973,9 @@ File: , Node: , Prev: , Up: Top
Tag Table:
Node: Top56
Node: 199
-Node:
493
-Node: 675
-Node: 855
+Node:
497
+Node: 679
+Node: 859
End Tag Table
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index a6c7575ba6..888ea45a97 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -1352,13 +1352,13 @@ File: , Node: EN QUAD| | EM QUAD| | EN SPACE| |, Up:
Top
* NARROW NO-BREAK SPACE| | MEDIUM MATHEMATICAL SPACE| | IDEOGRAPHIC SPACE| |::
-File: , Node: CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |,
Next: CARRIAGE RETURN|'."\r".'|, Up: EN QUAD| | EM QUAD| | EN SPACE| |
+File: , Node: CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |, Next:
CARRIAGE RETURN| |, Up: EN QUAD| | EM QUAD| | EN SPACE| |
-File: , Node: CARRIAGE RETURN|'."\r".'|, Next: NEXT LINE (NEL)|
| NO-BREAK
SPACE| | OGHAM SPACE MARK| |, Prev: CHARACTER TABULATION| | FORM FEED|
| LINE TABULATION| |, Up: EN QUAD| | EM QUAD| | EN SPACE| |
+File: , Node: CARRIAGE RETURN| |, Next: NEXT LINE (NEL)|
| NO-BREAK SPACE| |
OGHAM SPACE MARK| |, Prev: CHARACTER TABULATION| | FORM FEED| | LINE
TABULATION| |, Up: EN QUAD| | EM QUAD| | EN SPACE| |
-File: , Node: NEXT LINE (NEL)|
| NO-BREAK SPACE| | OGHAM SPACE MARK| |,
Next: MONGOLIAN VOWEL SEPARATOR|| EM SPACE| |, Prev: CARRIAGE
RETURN|'."\r".'|, Up: EN QUAD| | EM QUAD| | EN SPACE| |
+File: , Node: NEXT LINE (NEL)|
| NO-BREAK SPACE| | OGHAM SPACE MARK| |,
Next: MONGOLIAN VOWEL SEPARATOR|| EM SPACE| |, Prev: CARRIAGE RETURN| |, Up:
EN QUAD| | EM QUAD| | EN SPACE| |
File: , Node: MONGOLIAN VOWEL SEPARATOR|| EM SPACE| |, Next: THREE-PER-EM
SPACE| | FOUR-PER-EM SPACE| | SIX-PER-EM SPACE| |, Prev: NEXT LINE (NEL)|
|
NO-BREAK SPACE| | OGHAM SPACE MARK| |, Up: EN QUAD| | EM QUAD| | EN SPACE| |
@@ -1382,8 +1382,8 @@ File: , Node: NARROW NO-BREAK SPACE| | MEDIUM
MATHEMATICAL SPACE| | IDEOGRA
Tag Table:
Node: Top 55
Node: EN QUAD| | EM QUAD| | EN SPACE| |191
-Node: CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |768
-Node: CARRIAGE RETURN|'."\r".'|915
+Node: CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |768
+Node: CARRIAGE RETURN| |915
Node: NEXT LINE (NEL)|
| NO-BREAK SPACE| | OGHAM SPACE MARK| |1131
Node: MONGOLIAN VOWEL SEPARATOR|| EM SPACE| |1336
Node: THREE-PER-EM SPACE| | FOUR-PER-EM SPACE| | SIX-PER-EM SPACE| |1591
diff --git
a/tp/t/results/plaintext_tests/all_spaces/res_plaintext/all_spaces.txt
b/tp/t/results/plaintext_tests/all_spaces/res_plaintext/all_spaces.txt
index bca760f69c..d159e6e728 100644
--- a/tp/t/results/plaintext_tests/all_spaces/res_plaintext/all_spaces.txt
+++ b/tp/t/results/plaintext_tests/all_spaces/res_plaintext/all_spaces.txt
@@ -1,14 +1,14 @@
-CHARACTER TABULATION: | |
+CHARACTER TABULATION: | |
LINE FEED (LF): | |
- LINE TABULATION: | |
+ LINE TABULATION: | |
FORM FEED (FF): |
|
- CARRIAGE RETURN (CR): |
|
+ CARRIAGE RETURN (CR): | |
SPACE: | |
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index b6a8cd0941..9533f2808f 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -519,11 +519,11 @@ top
* '."\r".'::
* ::
-1 CARRIAGE RETURN|'."\r".'|
-*******************
+1 CARRIAGE RETURN| |
+********************
-2 CHARACTER TABULATION| | FORM FEED| |
-************************************
+2 CHARACTER TABULATION| | FORM FEED| |
+**************************************
diff --git
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index 02d0cb01dc..6c9dcc7301 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -519,11 +519,11 @@ top
* '."\r".'::
* ::
-1 CARRIAGE RETURN|'."\r".'|
-*******************
+1 CARRIAGE RETURN| |
+********************
-2 CHARACTER TABULATION| | FORM FEED| |
-************************************
+2 CHARACTER TABULATION| | FORM FEED| |
+**************************************
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index 9331d653d5..169fd4e1f9 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -1334,11 +1334,11 @@ File: , Node: , Next: , Prev: Top, Up: Top
1 EN QUAD| | EM QUAD| | EN SPACE| |
***********************************
-2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
-******************************************************
+2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
+*********************************************************
-3 CARRIAGE RETURN|'."\r".'|
-*******************
+3 CARRIAGE RETURN| |
+********************
File: , Node:
, Next: , Prev: , Up: Top
@@ -1363,9 +1363,9 @@ File: , Node: , Prev: , Up: Top
Tag Table:
Node: Top64
Node: 221
-Node:
515
-Node: 697
-Node: 877
+Node:
519
+Node: 701
+Node: 881
End Tag Table
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index 58f3e9a3cd..8d2c09041a 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -1334,11 +1334,11 @@ File: , Node: , Next: , Prev: Top, Up: Top
1 EN QUAD| | EM QUAD| | EN SPACE| |
***********************************
-2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
-******************************************************
+2 CHARACTER TABULATION| | FORM FEED| | LINE TABULATION| |
+*********************************************************
-3 CARRIAGE RETURN|'."\r".'|
-*******************
+3 CARRIAGE RETURN| |
+********************
File: , Node:
, Next: , Prev: , Up: Top
@@ -1363,9 +1363,9 @@ File: , Node: , Prev: , Up: Top
Tag Table:
Node: Top64
Node: 221
-Node:
515
-Node: 697
-Node: 877
+Node:
519
+Node: 701
+Node: 881
End Tag Table