[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/converters_tests.t: add inlinefmtspaces, i
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/converters_tests.t: add inlinefmtspaces, inlinerawspaces and inlineifsetifclearspaces, similar with other formatted tests but with soaces around arguments. |
|
Date: |
Sun, 04 Dec 2022 13:09:04 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new da7615cd62 * tp/t/converters_tests.t: add inlinefmtspaces,
inlinerawspaces and inlineifsetifclearspaces, similar with other formatted
tests but with soaces around arguments.
da7615cd62 is described below
commit da7615cd624e05d52266a9db3ea28b5386b79b65
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 4 19:08:07 2022 +0100
* tp/t/converters_tests.t: add inlinefmtspaces, inlinerawspaces
and inlineifsetifclearspaces, similar with other formatted tests but
with soaces around arguments.
* util/texinfo.dtd: fix the type of spaces attributes, @inline*
arguments are optional.
---
ChangeLog | 9 +
tp/Texinfo/command_data.txt | 8 +-
tp/maintain/check_back_xml_forth_texi_t.sh | 1 +
tp/t/converters_tests.t | 22 ++
tp/t/results/converters_tests/inlinefmtspaces.pl | 188 +++++++++++
.../converters_tests/inlineifsetifclearspaces.pl | 346 +++++++++++++++++++++
tp/t/results/converters_tests/inlinerawspaces.pl | 188 +++++++++++
util/texinfo.dtd | 32 +-
8 files changed, 779 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b0c434a4cb..c21f8661d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-12-04 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/converters_tests.t: add inlinefmtspaces, inlinerawspaces
+ and inlineifsetifclearspaces, similar with other formatted tests but
+ with soaces around arguments.
+
+ * util/texinfo.dtd: fix the type of spaces attributes, @inline*
+ arguments are optional.
+
2022-12-04 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo.texi (\pdflink) <XeTeX>: Fix definition.
diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
index b16a5ce416..2e98620647 100644
--- a/tp/Texinfo/command_data.txt
+++ b/tp/Texinfo/command_data.txt
@@ -405,10 +405,10 @@ shortcaption
brace,close_paragraph,contain_simple_text BRACE_conte
# main document context.
math brace,math,contain_simple_text BRACE_context
-# in this category, the leading and trailing spaces are put in specific
-# text with type, but commas do not delimitate arguments.
-# As other arguments brace_commands, they can only contain simple text,
-# ie not ref, footnote, titlefont, anchor, verb or even plain text,
+# in this category, the leading and trailing spaces are separated from
+# the arguments and commas do not delimitate arguments.
+# Similar with other arguments brace_commands, they can only contain
+# simple text (no ref, footnote, titlefont, anchor, verb) or even plain text,
# without even indicatric @-commands.
# Parsers have specific checks for U content.
U brace
BRACE_arguments 1
diff --git a/tp/maintain/check_back_xml_forth_texi_t.sh
b/tp/maintain/check_back_xml_forth_texi_t.sh
index fc282ae4cc..bde445bfe0 100755
--- a/tp/maintain/check_back_xml_forth_texi_t.sh
+++ b/tp/maintain/check_back_xml_forth_texi_t.sh
@@ -97,3 +97,4 @@ diff -u -r $mdir/backforth_plaintexi/
$mdir/backforth_checktexi/ > $mdir/plain_t
# To find XML parsing errors
# grep --color 'parser error' check_back_xml_forth_texi/backforth_logs/*
+# head -1000 check_back_xml_forth_texi/xmllint/*/*.2 > xmllint_all.log
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index b200035b80..b5e3bb2268 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -501,6 +501,15 @@ $inline_text, {'EXPANDED_FORMATS' => ['tex']},
',
{'EXPANDED_FORMATS' => []}
],
+# similar tests without leading/trailing spaces in t/*raw.t
+['inlinefmtspaces',
+'A @inlinefmt { plaintext , plaintext `` @lbracechar{} } a. Now html
+@inlinefmt{ html , in <i>@acronym{HTML}</i>}.
+'],
+['inlinerawspaces',
+'A @inlineraw{ plaintext , plaintext `` @lbracechar{} } a. Now html
+@inlineraw { html , in <i>@acronym{HTML}</i>}.
+'],
['inlineifsetifclear',
'@inlineifclear{aaa, iclear first }.
@@ -512,6 +521,19 @@ $inline_text, {'EXPANDED_FORMATS' => ['tex']},
@inlineifset{aaa, ifset second }.
'],
+['inlineifsetifclearspaces',
+'@inlineifclear
+{ aaa , iclear first }.
+
+@inlineifset
+{ aaa , ifset first }.
+
+@set aaa
+
+@inlineifclear { aaa , ifclear second }.
+
+@inlineifset { aaa , ifset second }.
+'],
['table_in_display_in_example',
'@example
@display
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl
b/tp/t/results/converters_tests/inlinefmtspaces.pl
new file mode 100644
index 0000000000..5e7aac36f6
--- /dev/null
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -0,0 +1,188 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'inlinefmtspaces'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'plaintext'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'plaintext `` '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'plaintext'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'in <i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'HTML'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '</i>'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'html'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'inlinefmtspaces'} = 'A @inlinefmt { plaintext , plaintext ``
@lbracechar{} } a. Now html
+@inlinefmt{ html , in <i>@acronym{HTML}</i>}.
+';
+
+
+$result_texts{'inlinefmtspaces'} = 'A a. Now html
+.
+';
+
+$result_errors{'inlinefmtspaces'} = [];
+
+
+$result_floats{'inlinefmtspaces'} = {};
+
+
+
+$result_converted{'plaintext'}->{'inlinefmtspaces'} = 'A plaintext “ { a. Now
html .
+';
+
+
+$result_converted{'html_text'}->{'inlinefmtspaces'} = '<p>A a. Now html
+in <i><abbr class="acronym">HTML</abbr></i>.
+</p>';
+
+
+$result_converted{'xml'}->{'inlinefmtspaces'} = '<para>A <inlinefmt
spacesaftercmd=" "><inlinefmtformat spaces=" ">plaintext
</inlinefmtformat><inlinefmtcontent spaces=" ">plaintext &textldquo;
&lbracechar; </inlinefmtcontent></inlinefmt> a. Now html
+<inlinefmt><inlinefmtformat spaces=" ">html
</inlinefmtformat><inlinefmtcontent spaces=" ">in
<i><acronym><acronymword>HTML</acronymword></acronym></i></inlinefmtcontent></inlinefmt>.
+</para>';
+
+
+$result_converted{'docbook'}->{'inlinefmtspaces'} = '<para>A a. Now html
+.
+</para>';
+
+
+$result_converted{'latex_text'}->{'inlinefmtspaces'} = 'A a. Now html
+.
+';
+
+1;
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
new file mode 100644
index 0000000000..bc73fe7832
--- /dev/null
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -0,0 +1,346 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'inlineifsetifclearspaces'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'iclear first '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineifclear',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'aaa'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'type' => 'elided'
+ }
+ ],
+ 'cmdname' => 'inlineifset',
+ 'extra' => {
+ 'format' => 'aaa'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'aaa',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'aaa',
+ ''
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' aaa
+'
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'type' => 'elided'
+ }
+ ],
+ 'cmdname' => 'inlineifclear',
+ 'extra' => {
+ 'format' => 'aaa'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'ifset second '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineifset',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'aaa'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'inlineifsetifclearspaces'} = '@inlineifclear
+{ aaa , iclear first }.
+
+@inlineifset
+{ aaa ,}.
+
+@set aaa
+
+@inlineifclear { aaa ,}.
+
+@inlineifset { aaa , ifset second }.
+';
+
+
+$result_texts{'inlineifsetifclearspaces'} = 'iclear first .
+
+.
+
+
+.
+
+ifset second .
+';
+
+$result_errors{'inlineifsetifclearspaces'} = [
+ {
+ 'error_line' => 'warning: command `@inlineifclear\' must not be followed
by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'command `@inlineifclear\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@inlineifset\' must not be followed by
new line
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'command `@inlineifset\' must not be followed by new line',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'inlineifsetifclearspaces'} = {};
+
+
+
+$result_converted{'plaintext'}->{'inlineifsetifclearspaces'} = 'iclear first .
+
+ .
+
+ .
+
+ ifset second .
+';
+
+
+$result_converted{'html_text'}->{'inlineifsetifclearspaces'} = '<p>iclear
first .
+</p>
+<p>.
+</p>
+
+<p>.
+</p>
+<p>ifset second .
+</p>';
+
+
+$result_converted{'xml'}->{'inlineifsetifclearspaces'} = '<para><inlineifclear
spacesaftercmd="\\n"><inlineifclearformat spaces=" ">aaa
</inlineifclearformat><inlineifclearcontent spaces=" ">iclear first
</inlineifclearcontent></inlineifclear>.
+</para>
+<para><inlineifset spacesaftercmd="\\n"><inlineifsetformat spaces=" ">aaa
</inlineifsetformat></inlineifset>.
+</para>
+<set name="aaa" line=" aaa"></set>
+
+<para><inlineifclear spacesaftercmd=" "><inlineifclearformat spaces=" ">aaa
</inlineifclearformat></inlineifclear>.
+</para>
+<para><inlineifset spacesaftercmd=" "><inlineifsetformat spaces=" ">aaa
</inlineifsetformat><inlineifsetcontent spaces=" ">ifset second
</inlineifsetcontent></inlineifset>.
+</para>';
+
+
+$result_converted{'docbook'}->{'inlineifsetifclearspaces'} = '<para>iclear
first .
+</para>
+<para>.
+</para>
+
+<para>.
+</para>
+<para>ifset second .
+</para>';
+
+
+$result_converted{'latex_text'}->{'inlineifsetifclearspaces'} = 'iclear first .
+
+.
+
+
+.
+
+ifset second .
+';
+
+1;
diff --git a/tp/t/results/converters_tests/inlinerawspaces.pl
b/tp/t/results/converters_tests/inlinerawspaces.pl
new file mode 100644
index 0000000000..cb7cb3d7fc
--- /dev/null
+++ b/tp/t/results/converters_tests/inlinerawspaces.pl
@@ -0,0 +1,188 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'inlinerawspaces'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'plaintext'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'plaintext `` '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'plaintext'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'in <i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'HTML'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '</i>'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'html'
+ },
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'inlinerawspaces'} = 'A @inlineraw{ plaintext , plaintext ``
@lbracechar{} } a. Now html
+@inlineraw { html , in <i>@acronym{HTML}</i>}.
+';
+
+
+$result_texts{'inlinerawspaces'} = 'A a. Now html
+.
+';
+
+$result_errors{'inlinerawspaces'} = [];
+
+
+$result_floats{'inlinerawspaces'} = {};
+
+
+
+$result_converted{'plaintext'}->{'inlinerawspaces'} = 'A plaintext `` { a.
Now html .
+';
+
+
+$result_converted{'html_text'}->{'inlinerawspaces'} = '<p>A a. Now html
+in <i><abbr class="acronym">HTML</abbr></i>.
+</p>';
+
+
+$result_converted{'xml'}->{'inlinerawspaces'} = '<para>A
<inlineraw><inlinerawformat spaces=" ">plaintext
</inlinerawformat><inlinerawcontent spaces=" ">plaintext &textldquo;
&lbracechar; </inlinerawcontent></inlineraw> a. Now html
+<inlineraw spacesaftercmd=" "><inlinerawformat spaces=" ">html
</inlinerawformat><inlinerawcontent spaces=" ">in
<i><acronym><acronymword>HTML</acronymword></acronym></i></inlinerawcontent></inlineraw>.
+</para>';
+
+
+$result_converted{'docbook'}->{'inlinerawspaces'} = '<para>A a. Now html
+.
+</para>';
+
+
+$result_converted{'latex_text'}->{'inlinerawspaces'} = 'A a. Now html
+.
+';
+
+1;
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 01c57bbdec..9c54968b0e 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -1059,7 +1059,7 @@
<!ELEMENT hyphenation (#PCDATA)>
<!ATTLIST hyphenation
- %spacesaftercmdattr;>
+ %spacesafterincmdattr;>
<!-- emphasize -->
<!ELEMENT strong (#PCDATA | %Inline.phraseormark;)*>
@@ -1131,7 +1131,7 @@
%spacesaftercmdattr;>
<!ELEMENT indicateurl (#PCDATA | %Inline.phrase;)*>
<!ATTLIST indicateurl
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT clicksequence (#PCDATA | %Inline.phrase;)*>
<!ATTLIST clicksequence
%spacesaftercmdattr;>
@@ -1185,42 +1185,52 @@
%spacesafterincmdattr;>
<!-- inline conditionals -->
-<!ELEMENT inlineraw (inlinerawformat, inlinerawcontent)>
+<!ELEMENT inlineraw (inlinerawformat, inlinerawcontent?)>
<!ATTLIST inlineraw
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT inlinerawformat (#PCDATA)>
+<!ATTLIST inlinerawformat
+ %spacesattr;>
<!ELEMENT inlinerawcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinerawcontent
%spacesattr;>
-<!ELEMENT inlinefmt (inlinefmtformat, inlinefmtcontent)>
+<!ELEMENT inlinefmt (inlinefmtformat, inlinefmtcontent?)>
<!ATTLIST inlinefmt
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT inlinefmtformat (#PCDATA)>
+<!ATTLIST inlinefmtformat
+ %spacesattr;>
<!ELEMENT inlinefmtcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinefmtcontent
%spacesattr;>
-<!ELEMENT inlineifclear (inlineifclearformat, inlineifclearcontent)>
+<!ELEMENT inlineifclear (inlineifclearformat, inlineifclearcontent?)>
<!ATTLIST inlineifclear
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT inlineifclearformat (#PCDATA)>
+<!ATTLIST inlineifclearformat
+ %spacesattr;>
<!ELEMENT inlineifclearcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlineifclearcontent
%spacesattr;>
-<!ELEMENT inlineifset (inlineifsetformat, inlineifsetcontent)>
+<!ELEMENT inlineifset (inlineifsetformat, inlineifsetcontent?)>
<!ATTLIST inlineifset
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT inlineifsetformat (#PCDATA)>
+<!ATTLIST inlineifsetformat
+ %spacesattr;>
<!ELEMENT inlineifsetcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlineifsetcontent
%spacesattr;>
<!ELEMENT inlinefmtifelse (inlinefmtifelseformat, inlinefmtifelsecontentif?,
inlinefmtifelsecontentelse?)>
<!ATTLIST inlinefmtifelse
- %spacesafterincmdattr;>
+ %spacesaftercmdattr;>
<!ELEMENT inlinefmtifelseformat (#PCDATA)>
+<!ATTLIST inlinefmtifelseformat
+ %spacesattr;>
<!ELEMENT inlinefmtifelsecontentif (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinefmtifelsecontentif
%spacesattr;>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/converters_tests.t: add inlinefmtspaces, inlinerawspaces and inlineifsetifclearspaces, similar with other formatted tests but with soaces around arguments.,
Patrice Dumas <=