branch master updated: * util/texinfo.dtd: allow mixing *caption within float contents. Fix email spaces attributes.

[Patrice Dumas]

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 20f9975d3f * util/texinfo.dtd: allow mixing *caption within float 
contents.  Fix email spaces attributes.
20f9975d3f is described below

commit 20f9975d3ff424cc78fdc242c31aacbf2e10ad88
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 4 22:09:07 2022 +0100

    * util/texinfo.dtd: allow mixing *caption within float contents.  Fix
    email spaces attributes.
---
 ChangeLog        | 5 +++++
 util/texinfo.dtd | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 724a499c6e..7d488e990c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
        old copy of layout/formatting.texi with an added
        "@documentencoding utf8" line.
 
+2022-12-04  Patrice Dumas  <pertusus@free.fr>
+
+       * util/texinfo.dtd: allow mixing *caption within float contents.  Fix
+       email spaces attributes.
+
 2022-12-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/converters_tests.t: add inlinefmtspaces, inlinerawspaces
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 9c54968b0e..583477dc96 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -787,8 +787,7 @@
           %spacesattr;>
 
 <!-- Floating displays -->
-<!ELEMENT float (floattype?, floatname?, (%block;)*,
-                (caption | shortcaption)*)>
+<!ELEMENT float (floattype?, floatname?, (%block; | caption | shortcaption)*)>
 <!ATTLIST float
           %spacesblockattr;
           number CDATA #IMPLIED
@@ -1295,7 +1294,7 @@
 
 <!ELEMENT email (emailaddress, emailname?)>
 <!ATTLIST email
-          %spacesattr;>
+          %spacesaftercmdattr;>
 <!ELEMENT emailaddress (#PCDATA | %Inline.phrase;)*>
 <!ATTLIST emailaddress
           %spacesattr;>