[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test... |
|
Date: |
Wed, 09 Sep 2009 21:20:20 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/09 21:20:19
Modified files:
. : ChangeLog TODO
formats : info.init
test/formatting: Makefile.am Makefile.in tests.txt
Added files:
test/formatting: punctuation_frenchspacing.texi
test/formatting/res/punctuation_frenchspacing:
punctuation_frenchspacing.1
punctuation_frenchspacing.2
punctuation_frenchspacing.html
test/formatting/res_all/punctuation_frenchspacing:
punctuation_frenchspacing.1
punctuation_frenchspacing.2
punctuation_frenchspacing.txt
test/formatting/res_info/punctuation_frenchspacing:
punctuation_frenchspacing.1
punctuation_frenchspacing.2
punctuation_frenchspacing.info
Log message:
* formats/info.init: take @frenchspacing into account.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.430&r2=1.431
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.am?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/punctuation_frenchspacing.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.txt?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.info?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -b -r1.430 -r1.431
--- ChangeLog 9 Sep 2009 18:56:04 -0000 1.430
+++ ChangeLog 9 Sep 2009 21:20:10 -0000 1.431
@@ -5,6 +5,7 @@
Don't treat _setfilename as a value set. It should be available
through get_conf.
Handle better bogus uses of @setfilename.
+ * formats/info.init: take @frenchspacing into account.
2009-09-09 Patrice Dumas <address@hidden>
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- TODO 9 Sep 2009 18:56:04 -0000 1.142
+++ TODO 9 Sep 2009 21:20:11 -0000 1.143
@@ -8,8 +8,6 @@
* ship the css file from http://planet.gnu.org/~ams/.
-* take into account @frenchspacing in info
-
* in sectionning, test nodes_after_top_before_section_use_nodes_chapter
not split at chapter. It is split at nodes although top node is not
always considered as an element. out_html is much better, since at least
Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- formats/info.init 6 Sep 2009 21:45:57 -0000 1.28
+++ formats/info.init 9 Sep 2009 21:20:12 -0000 1.29
@@ -1516,7 +1516,7 @@
my $new_text = $content->{'text'};
# a punctuation at the end of a command is treated like a
punctuation in
#Â plain text, except for @: and accent commands.
- if ((!defined($content->{'command'}) or
($content->{'command'} ne ':' and $content->{'command'} ne 'accents_commands'))
and $new_text =~
/([$info_default_end_sentence_character])([$info_default_after_punctuation_characters]*)(\s*)$/)
+ if ((!defined($content->{'command'}) or
($content->{'command'} ne ':' and $content->{'command'} ne 'accents_commands'))
and get_conf('frenchspacing') ne 'on' and $new_text =~
/([$info_default_end_sentence_character])([$info_default_after_punctuation_characters]*)(\s*)$/)
{
#Â the info_default_after_punctuation_characters should
#Â always be in the same text element.
@@ -1526,6 +1526,10 @@
}
else
{
+#if (defined($content->{'command'}))
+#{
+# main::msg_debug ("$content->{'command'} ($content->{'text'})",
$content->{'line_nr'});
+#}
# spaces may be in following commands
my ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current, $index, $close);
while (1)
@@ -1542,6 +1546,7 @@
{
if (chomp($text_next))
{
+#print STDERR "DOIT\n";
info_default_skip_spaces($current,
$index, $close);
$new_text =~ s/(\s*)$/ /;
last;
@@ -1554,10 +1559,6 @@
elsif (chomp($new_text))
{
$new_text =~ s/(\s*)$/ /;
- # if ($new_text =~
/[$info_default_end_sentence_character] $/)
- # {
- # $new_text .= ' ';
- # }
}
$text_added .= $new_text;
} # ignore spaces outside of paragraphs and preformatted
Index: test/formatting/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test/formatting/Makefile.am 30 Aug 2009 18:59:55 -0000 1.23
+++ test/formatting/Makefile.am 9 Sep 2009 21:20:13 -0000 1.24
@@ -2,6 +2,7 @@
float_with_at_commands.texi float_copying.texi macro_in_menu.texi \
ref_in_anchor.texi tex.texi block_EOL.texi detailmenus.texi \
commands_in_ifset.texi simplest.texi punctuation.texi \
+ punctuation_frenchspacing.texi \
simple_punctuation.texi def_end_of_line.texi \
center.texi tables.texi formats_in_menu.texi heading.texi quotes.texi \
indicateurl_paragraph.texi complex_command_in_simple_command.texi \
Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test/formatting/Makefile.in 6 Sep 2009 21:46:17 -0000 1.23
+++ test/formatting/Makefile.in 9 Sep 2009 21:20:14 -0000 1.24
@@ -137,6 +137,7 @@
float_with_at_commands.texi float_copying.texi macro_in_menu.texi \
ref_in_anchor.texi tex.texi block_EOL.texi detailmenus.texi \
commands_in_ifset.texi simplest.texi punctuation.texi \
+ punctuation_frenchspacing.texi \
simple_punctuation.texi def_end_of_line.texi \
center.texi tables.texi formats_in_menu.texi heading.texi quotes.texi \
indicateurl_paragraph.texi complex_command_in_simple_command.texi \
Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- test/formatting/tests.txt 3 Sep 2009 15:06:08 -0000 1.29
+++ test/formatting/tests.txt 9 Sep 2009 21:20:16 -0000 1.30
@@ -11,6 +11,7 @@
texi commands_in_ifset.texi
texi simplest.texi
texi punctuation.texi
+texi frenchspacing_punctuation.texi
texi simple_punctuation.texi
texi def_end_of_line.texi
texi def_end_of_line_footnote.texi
@@ -65,6 +66,7 @@
commands_in_ifset commands_in_ifset.texi
simplest_test_css simplest.texi --css-include file.css
punctuation punctuation.texi
+punctuation_frenchspacing punctuation_frenchspacing.texi
simple_punctuation simple_punctuation.texi
def_end_of_line def_end_of_line.texi
def_end_of_line_footnote def_end_of_line_footnote.texi
Index: test/formatting/punctuation_frenchspacing.texi
===================================================================
RCS file: test/formatting/punctuation_frenchspacing.texi
diff -N test/formatting/punctuation_frenchspacing.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/punctuation_frenchspacing.texi 9 Sep 2009 21:20:16
-0000 1.1
@@ -0,0 +1,97 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden punctuation_frenchspacing.info
+
address@hidden on
+
address@hidden Top
address@hidden Element
+
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+End of lines Dot.
+Exclam!
+Question?
+End.
+
+End of lines and spaces
+Dot.
+Exclam!
+Question?
+End.
+
+With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+End of lines paren.)
+Symb.)"']
+End.
+
+End of lines and spaces paren.)
+Symb.)"']
+End.
+
+
+
address@hidden End of sentences
+
address@hidden address@hidden address@hidden address@hidden address@hidden
address@hidden GAAA.
+
address@hidden address@hidden GBBB.
+
+End of lines address@hidden
address@hidden
address@hidden
address@hidden
+End.
+
+End of lines and spaces
address@hidden
address@hidden
address@hidden
address@hidden
+End.
+
+With address@hidden) address@hidden) address@hidden)"'] address@hidden)"']
End.
+
+End of lines address@hidden)
address@hidden)"']
+End.
+
+End of lines and spaces address@hidden)
address@hidden)"']
+End.
+
address@hidden Not end of line
+
+Dot.@: Exclam!@: Question?@: Dot.@: Exclam!@: Question?@: GAAA.
+
+End of lines Dot.@:
+Exclam!@:
+Question?@:
+End.
+
+End of lines and spaces
+Dot.@:
+Exclam!@:
+Question?@:
+End.
+
+With paren.@:) paren.@:) Symb.@:)"'] Symb.@:)"'] End.
+
+End of lines paren.@:)
+Symb.@:)"']
+End.
+
+End of lines and spaces paren.@:)
+Symb.@:)"']
+End.
+
address@hidden Accent leading to a dot
+
address@hidden in sentence.
+
+At the end of line @dotaccent{o}
+text following.
+
address@hidden
Index: test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.1
===================================================================
RCS file:
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.1
diff -N
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.1
Index: test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.2
===================================================================
RCS file:
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.2
diff -N
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.2
Index:
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.html
===================================================================
RCS file:
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.html
diff -N
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/punctuation_frenchspacing/punctuation_frenchspacing.html
9 Sep 2009 21:20:17 -0000 1.1
@@ -0,0 +1,147 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Element</title>
+
+<meta name="description" content="Element">
+<meta name="keywords" content="Element">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="Element"></a>
+<h1 class="unnumbered">Element</h1>
+
+
+<p>Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+</p>
+<p>End of lines Dot.
+Exclam!
+Question?
+End.
+</p>
+<p>End of lines and spaces
+Dot.
+Exclam!
+Question?
+End.
+</p>
+<p>With paren.) paren.) Symb.)"’] Symb.)"’] End.
+</p>
+<p>End of lines paren.)
+Symb.)"’]
+End.
+</p>
+<p>End of lines and spaces paren.)
+Symb.)"’]
+End.
+</p>
+
+
+<a name="End-of-sentences"></a>
+<h2 class="heading">End of sentences</h2>
+
+<p>Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+</p>
+<p>Enddots<small class="enddots">...</small> Enddots<small
class="enddots">...</small> GBBB.
+</p>
+<p>End of lines Dot.
+Exclam!
+Question?
+Enddots<small class="enddots">...</small>
+End.
+</p>
+<p>End of lines and spaces
+Dot.
+Exclam!
+Question?
+Enddots<small class="enddots">...</small>
+End.
+</p>
+<p>With paren.) paren.) Symb.)"’] Symb.)"’] End.
+</p>
+<p>End of lines paren.)
+Symb.)"’]
+End.
+</p>
+<p>End of lines and spaces paren.)
+Symb.)"’]
+End.
+</p>
+<a name="Not-end-of-line"></a>
+<h2 class="heading">Not end of line</h2>
+
+<p>Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+</p>
+<p>End of lines Dot.
+Exclam!
+Question?
+End.
+</p>
+<p>End of lines and spaces
+Dot.
+Exclam!
+Question?
+End.
+</p>
+<p>With paren.) paren.) Symb.)"’] Symb.)"’] End.
+</p>
+<p>End of lines paren.)
+Symb.)"’]
+End.
+</p>
+<p>End of lines and spaces paren.)
+Symb.)"’]
+End.
+</p>
+<a name="Accent-leading-to-a-dot"></a>
+<h2 class="heading">Accent leading to a dot</h2>
+
+<p>ȯ in sentence.
+</p>
+<p>At the end of line ȯ
+text following.
+</p>
+<hr>
+<p>
+ <font size="-1">
+ This document was generated on <i>a sunny day</i> using <a
href="http://www.nongnu.org/texi2html/";><i>texi2html</i></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.1
===================================================================
RCS file:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.1
diff -N
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.1
Index:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.2
===================================================================
RCS file:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.2
diff -N
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.2
Index:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.txt
===================================================================
RCS file:
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.txt
diff -N
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res_all/punctuation_frenchspacing/punctuation_frenchspacing.txt
9 Sep 2009 21:20:18 -0000 1.1
@@ -0,0 +1,93 @@
+Element
+*******
+
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+End of lines Dot.
+Exclam!
+Question?
+End.
+
+End of lines and spaces
+Dot.
+Exclam!
+Question?
+End.
+
+With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+End of lines paren.)
+Symb.)"']
+End.
+
+End of lines and spaces paren.)
+Symb.)"']
+End.
+
+
+
+End of sentences
+================
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+Enddots... Enddots... GBBB.
+
+End of lines Dot.
+Exclam!
+Question?
+Enddots...
+End.
+
+End of lines and spaces
+Dot.
+Exclam!
+Question?
+Enddots...
+End.
+
+With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+End of lines paren.)
+Symb.)"']
+End.
+
+End of lines and spaces paren.)
+Symb.)"']
+End.
+
+Not end of line
+===============
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+End of lines Dot.
+Exclam!
+Question?
+End.
+
+End of lines and spaces
+Dot.
+Exclam!
+Question?
+End.
+
+With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+End of lines paren.)
+Symb.)"']
+End.
+
+End of lines and spaces paren.)
+Symb.)"']
+End.
+
+Accent leading to a dot
+=======================
+
+o. in sentence.
+
+At the end of line o.
+text following.
+
Index:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.1
===================================================================
RCS file:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.1
diff -N
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.1
Index:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.2
===================================================================
RCS file:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.2
diff -N
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.2
Index:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.info
===================================================================
RCS file:
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.info
diff -N
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res_info/punctuation_frenchspacing/punctuation_frenchspacing.info
9 Sep 2009 21:20:19 -0000 1.1
@@ -0,0 +1,66 @@
+This is punctuation_frenchspacing.info, produced by makeinfo version
+4.13 from punctuation_frenchspacing.texi.
+
+
+File: punctuation_frenchspacing.info, Node: Top, Up: (dir)
+
+Element
+*******
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+ End of lines Dot. Exclam! Question? End.
+
+ End of lines and spaces Dot. Exclam! Question? End.
+
+ With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+ End of lines paren.) Symb.)"'] End.
+
+ End of lines and spaces paren.) Symb.)"'] End.
+
+End of sentences
+================
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+ Enddots... Enddots... GBBB.
+
+ End of lines Dot. Exclam! Question? Enddots... End.
+
+ End of lines and spaces Dot. Exclam! Question? Enddots... End.
+
+ With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+ End of lines paren.) Symb.)"'] End.
+
+ End of lines and spaces paren.) Symb.)"'] End.
+
+Not end of line
+===============
+
+Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+
+ End of lines Dot. Exclam! Question? End.
+
+ End of lines and spaces Dot. Exclam! Question? End.
+
+ With paren.) paren.) Symb.)"'] Symb.)"'] End.
+
+ End of lines paren.) Symb.)"'] End.
+
+ End of lines and spaces paren.) Symb.)"'] End.
+
+Accent leading to a dot
+=======================
+
+o. in sentence.
+
+ At the end of line o. text following.
+
+
+
+Tag Table:
+Node: Top112
+
+End Tag Table
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test...,
Patrice Dumas <=