[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: util/texinfo.dtd: fix menuleadingtext mixed conte
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: util/texinfo.dtd: fix menuleadingtext mixed content specification |
|
Date: |
Fri, 02 Dec 2022 17:19:19 -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 21259bf80e util/texinfo.dtd: fix menuleadingtext mixed content
specification
21259bf80e is described below
commit 21259bf80ec70b2232ee60b7fc7ed3db451d379c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 2 23:18:42 2022 +0100
util/texinfo.dtd: fix menuleadingtext mixed content specification
---
util/texinfo.dtd | 244 +++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 175 insertions(+), 69 deletions(-)
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 47598710a9..01c57bbdec 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -47,7 +47,7 @@
| %variable.cmds; | kbdinputstyle | paragraphindent
| firstparagraphindent | urefbreakstyle | xrefautomaticsectiontitle
| deftypefnnewline
- | codequoteundirected | codequotebacktick | raisesections
+ | codequoteundirected | codequotebacktick | microtype | raisesections
| lowersections | clickstyle
| synindex | syncodeindex">
@@ -60,8 +60,9 @@
<!ENTITY % intitlepage.cmds "author | title | subtitle">
<!-- index entry commands -->
-<!ENTITY % indexentry.cmds "cindex | findex | kindex | pindex | tindex
- | vindex | indexcommand | subentry">
+<!ENTITY % indexentry.cmds "cindex | cpindex | findex | fnindex
+ | kindex | kyindex | pindex | pgindex | tindex | tpindex
+ | vindex | vrindex | indexcommand | subentry">
<!-- API definition commands -->
<!ENTITY % def.cmds "deffn | defvr | deftypefn | deftypeop | deftypevr
@@ -125,6 +126,7 @@
| printindex | listoffloats">
<!-- toplevel content, not in copying nor footnote -->
+<!-- FIXME can also contain @* &linebreak; which is CDATA-->
<!ENTITY % main.content "%block; | %toplevelonly.content; | node">
<!ENTITY % section.level0.content "(%main.content;
@@ -148,6 +150,8 @@
<!ENTITY % section.level4.content "(%main.content;)*">
+<!ENTITY % Spaces.elements "formfeed | verticaltab">
+
<!-- Inline -->
<!ENTITY % Inline.emphasize "strong | emph">
<!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | t
@@ -160,9 +164,9 @@
<!ENTITY % Inline.reference "xref | ref | pxref | inforef ">
<!ENTITY % Inline.hyperreference "email | uref | url">
<!ENTITY % Inline.misc "click | clicksequence | logo | punct | spacecmd | today
- | linebreak | accent | dotless | ctrl | inlineraw
- | inlinefmt | inlinefmtifelse | inlineifclear
- | inlineifset | infoenclose | noeos | formfeed | U ">
+ | linebreak | accent | dotless | ctrl | inlineraw
+ | inlinefmt | inlinefmtifelse | inlineifclear
+ | inlineifset | infoenclose | noeos | U |
%Spaces.elements;">
<!-- on lines -->
<!ENTITY % Inline.linesimpletext "%Inline.emphasize; | %Inline.misc; |
%Inline.fonts;
@@ -182,15 +186,19 @@
<!ENTITY % Inline.fullline "%Inline.line; | titlefont | anchor">
<!-- on headings specification lines -->
-<!ENTITY % Inline.headingmark "divideheading | thischapter | thischaptername
+<!ENTITY % Inline.headingmark "thischapter | thischaptername
| thischapternum | thissection | thissectionname | thissectionnum
| thisfile | thispage | thistitle">
-<!ENTITY % Inline.headingline "%Inline.linesimpletext; | %Inline.headingmark;">
+<!ENTITY % Inline.headingline "%Inline.linesimpletext; | divideheading
+ | %Inline.headingmark;">
<!-- in paragraphs -->
<!ENTITY % Inline.phrase
"%Inline.line; | %ubiquitous.cmds;">
+<!ENTITY % Inline.phraseormark
+ "%Inline.phrase; | %Inline.headingmark;">
+
<!-- in raw (everything except sectioning commands) -->
<!ENTITY % Raw.content "#PCDATA | %intitlepage.cmds; | %block;
| %Inline.linetext; | exdent | %toplevelonly.content;
@@ -205,6 +213,16 @@
<!-- ubiquitous attribute -->
<!ENTITY % spacesattr
"spaces CDATA #IMPLIED">
+<!ENTITY % spacesaftercmdattr
+ "spacesaftercmd CDATA #IMPLIED">
+<!-- spaces possibly before command opening brace and in braces -->
+<!ENTITY % spacesafterincmdattr
+ "%spacesattr; %spacesaftercmdattr;">
+<!ENTITY % trailingspacesattr
+ "trailingspaces CDATA #IMPLIED">
+<!-- spaces and trailing spaces for node and for bracketed @def* args -->
+<!ENTITY % spacestrailingspacesattr
+ "%spacesattr; %trailingspacesattr;">
<!ENTITY % lineattr
"line CDATA #IMPLIED">
<!ENTITY % linespaceattr
@@ -255,7 +273,7 @@
%lineattr;
name CDATA #REQUIRED>
<!ELEMENT definfoenclose EMPTY>
-<!ATTLIST definfoenclose
+<!ATTLIST definfoenclose
%linespaceattr;
command NMTOKEN #REQUIRED
open CDATA #IMPLIED
@@ -397,11 +415,11 @@
<!-- Global options -->
<!ELEMENT documentlanguage (#PCDATA)>
-<!ATTLIST documentlanguage
+<!ATTLIST documentlanguage
%spacesattr;
xml:lang (%languagecodes;) 'en'>
<!ELEMENT frenchspacing (#PCDATA)> <!-- must be on or off -->
-<!ATTLIST frenchspacing
+<!ATTLIST frenchspacing
%linespaceattr;
value (%onoff;) 'off'>
<!ELEMENT kbdinputstyle EMPTY>
@@ -417,6 +435,11 @@
<!ATTLIST firstparagraphindent
%linespaceattr;
value CDATA #REQUIRED>
+<!ELEMENT microtype EMPTY>
+<!-- "on|off" -->
+<!ATTLIST microtype
+ %linespaceattr;
+ value CDATA #REQUIRED>
<!ELEMENT urefbreakstyle EMPTY>
<!-- "after|before|none" -->
<!ATTLIST urefbreakstyle
@@ -504,18 +527,15 @@
trailingspaces CDATA #IMPLIED>
<!ELEMENT nodenext (#PCDATA | %Inline.line;)*>
<!ATTLIST nodenext
- %spacesattr;
- trailingspaces CDATA #IMPLIED
+ %spacestrailingspacesattr;
automatic (%onoff;) 'off'>
<!ELEMENT nodeprev (#PCDATA | %Inline.line;)*>
<!ATTLIST nodeprev
- %spacesattr;
- trailingspaces CDATA #IMPLIED
+ %spacestrailingspacesattr;
automatic (%onoff;) 'off'>
<!ELEMENT nodeup (#PCDATA | %Inline.line;)*>
<!ATTLIST nodeup
- %spacesattr;
- trailingspaces CDATA #IMPLIED
+ %spacestrailingspacesattr;
automatic (%onoff;) 'off'>
<!ENTITY % sectionsattr
@@ -668,6 +688,8 @@
%spacesattr;
where CDATA #IMPLIED>
<!ELEMENT imagefile (#PCDATA | %Inline.line;)*>
+<!ATTLIST imagefile
+ %spacesattr;>
<!ELEMENT imagewidth (#PCDATA)>
<!ATTLIST imagewidth
%spacesattr;>
@@ -683,7 +705,7 @@
<!-- Whitespace in these elements are always preserved -->
<!ELEMENT verbatim (#PCDATA)>
-<!ATTLIST verbatim
+<!ATTLIST verbatim
%spacesblockattr;
xml:space (preserve) #FIXED 'preserve'>
@@ -706,7 +728,7 @@
<!ELEMENT menuentry (menuleadingtext,
((menutitle, menuseparator, menunode, menuseparator?)
| (menunode, menuseparator)), menudescription?)>
-<!ELEMENT menuleadingtext (#PCDATA)>
+<!ELEMENT menuleadingtext (#PCDATA | %Spaces.elements;)*>
<!ELEMENT menunode (#PCDATA | %Inline.line;)*>
<!ELEMENT menutitle (#PCDATA | %Inline.line;)*>
<!ELEMENT menuseparator (#PCDATA)>
@@ -778,15 +800,17 @@
%spacesattr;>
<!ELEMENT caption (#PCDATA | %block;)*>
<!ATTLIST caption
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT shortcaption (#PCDATA | %Inline.phrase; | para)*>
+<!ATTLIST shortcaption
+ %spacesafterincmdattr;>
<!ELEMENT listoffloats (#PCDATA | %Inline.line;)*>
<!ATTLIST listoffloats
%spacesattr;
type CDATA #IMPLIED>
<!-- Lists -->
-<!ELEMENT itemize (itemprepend?, beforefirstitem?,
+<!ELEMENT itemize (itemprepend?, beforefirstitem?,
(listitem | %indexentry.cmds;)*)>
<!ATTLIST itemize
%spacesblockattr;
@@ -845,7 +869,7 @@
end CDATA #IMPLIED>
<!ELEMENT tableitem (%block;)*>
-<!ELEMENT multitable ((columnfractions | columnprototypes), beforefirstitem?,
+<!ELEMENT multitable ((columnfractions | columnprototypes), beforefirstitem?,
thead?, tbody)>
<!ATTLIST multitable
%blocktablearg;>
@@ -996,7 +1020,7 @@
<!ELEMENT definitionitem (%block;)*>
<!ENTITY % defargattr
- "%bracketedattr; %spacesattr;">
+ "%bracketedattr; %spacestrailingspacesattr;">
<!ELEMENT defcategory (#PCDATA | %Inline.line;)*>
<!ATTLIST defcategory
%defargattr;
@@ -1034,50 +1058,103 @@
Inline elements -->
<!ELEMENT hyphenation (#PCDATA)>
+<!ATTLIST hyphenation
+ %spacesaftercmdattr;>
<!-- emphasize -->
-<!ELEMENT strong (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT emph (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT strong (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST strong
+ %spacesaftercmdattr;>
+<!ELEMENT emph (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST emph
+ %spacesaftercmdattr;>
<!-- small caps -->
-<!ELEMENT sc (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT sc (#PCDATA | %Inline.phraseormark;)*>
<!-- fonts -->
-<!ELEMENT b (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT i (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT r (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT sansserif (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT slanted (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT titlefont (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT t (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT b (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST b
+ %spacesaftercmdattr;>
+<!ELEMENT i (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST i
+ %spacesaftercmdattr;>
+<!ELEMENT r (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST r
+ %spacesaftercmdattr;>
+<!ELEMENT sansserif (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST sansserif
+ %spacesaftercmdattr;>
+<!ELEMENT slanted (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST slanted
+ %spacesaftercmdattr;>
+<!ELEMENT titlefont (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST titlefont
+ %spacesaftercmdattr;>
+<!ELEMENT t (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST t
+ %spacesaftercmdattr;>
<!-- markup -->
-<!ELEMENT code (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT command (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT env (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT file (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT option (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT samp (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT dfn (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT cite (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT key (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT kbd (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT var (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT code (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST code
+ %spacesaftercmdattr;>
+<!ELEMENT command (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST command
+ %spacesaftercmdattr;>
+<!ELEMENT env (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST env
+ %spacesaftercmdattr;>
+<!ELEMENT file (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST file
+ %spacesaftercmdattr;>
+<!ELEMENT option (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST option
+ %spacesaftercmdattr;>
+<!ELEMENT samp (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST samp
+ %spacesaftercmdattr;>
+<!ELEMENT dfn (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST dfn
+ %spacesaftercmdattr;>
+<!ELEMENT cite (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST cite
+ %spacesaftercmdattr;>
+<!ELEMENT key (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST key
+ %spacesaftercmdattr;>
+<!ELEMENT kbd (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST kbd
+ %spacesaftercmdattr;>
+<!ELEMENT var (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST var
+ %spacesaftercmdattr;>
<!ELEMENT indicateurl (#PCDATA | %Inline.phrase;)*>
<!ATTLIST indicateurl
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT clicksequence (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST clicksequence
+ %spacesaftercmdattr;>
<!ELEMENT w (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT asis (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT sub (#PCDATA | %Inline.phrase;)*>
-<!ELEMENT sup (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST w
+ %spacesaftercmdattr;>
+<!ELEMENT asis (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST asis
+ %spacesaftercmdattr;>
+<!ELEMENT sub (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST sub
+ %spacesaftercmdattr;>
+<!ELEMENT sup (#PCDATA | %Inline.phraseormark;)*>
+<!ATTLIST sup
+ %spacesaftercmdattr;>
<!ELEMENT verb (#PCDATA)>
<!ATTLIST verb
+ %spacesaftercmdattr;
delimiter CDATA #REQUIRED>
<!ELEMENT acronym (acronymword, acronymdesc?)>
<!ATTLIST acronym
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*>
<!ELEMENT acronymdesc (#PCDATA | %Inline.phrase;)*>
<!ATTLIST acronymdesc
@@ -1085,7 +1162,7 @@
<!ELEMENT abbr (abbrword, abbrdesc?)>
<!ATTLIST abbr
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT abbrword (#PCDATA | %Inline.phrase;)*>
<!ELEMENT abbrdesc (#PCDATA | %Inline.phrase;)*>
<!ATTLIST abbrdesc
@@ -1094,23 +1171,23 @@
<!-- math -->
<!ELEMENT math (#PCDATA | %Inline.phrase;)*>
<!ATTLIST math
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT dmn (#PCDATA | %Inline.phrase;)*>
<!-- reference -->
<!ELEMENT anchor (#PCDATA | %Inline.phrase;)*>
<!ATTLIST anchor
- %spacesattr;
+ %spacesafterincmdattr;
name CDATA #IMPLIED>
<!ELEMENT errormsg (#PCDATA | %Inline.phrase;)*>
<!ATTLIST errormsg
- %spacesattr;>
+ %spacesafterincmdattr;>
<!-- inline conditionals -->
<!ELEMENT inlineraw (inlinerawformat, inlinerawcontent)>
<!ATTLIST inlineraw
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT inlinerawformat (#PCDATA)>
<!ELEMENT inlinerawcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinerawcontent
@@ -1118,7 +1195,7 @@
<!ELEMENT inlinefmt (inlinefmtformat, inlinefmtcontent)>
<!ATTLIST inlinefmt
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT inlinefmtformat (#PCDATA)>
<!ELEMENT inlinefmtcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinefmtcontent
@@ -1126,7 +1203,7 @@
<!ELEMENT inlineifclear (inlineifclearformat, inlineifclearcontent)>
<!ATTLIST inlineifclear
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT inlineifclearformat (#PCDATA)>
<!ELEMENT inlineifclearcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlineifclearcontent
@@ -1134,7 +1211,7 @@
<!ELEMENT inlineifset (inlineifsetformat, inlineifsetcontent)>
<!ATTLIST inlineifset
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT inlineifsetformat (#PCDATA)>
<!ELEMENT inlineifsetcontent (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlineifsetcontent
@@ -1142,7 +1219,7 @@
<!ELEMENT inlinefmtifelse (inlinefmtifelseformat, inlinefmtifelsecontentif?,
inlinefmtifelsecontentelse?)>
<!ATTLIST inlinefmtifelse
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT inlinefmtifelseformat (#PCDATA)>
<!ELEMENT inlinefmtifelsecontentif (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inlinefmtifelsecontentif
@@ -1155,6 +1232,7 @@
<!-- command defined by definfoenclose -->
<!ELEMENT infoenclose (#PCDATA | %Inline.phrase;)*>
<!ATTLIST infoenclose
+ %spacesaftercmdattr;
command CDATA #REQUIRED
begin CDATA #IMPLIED
end CDATA #IMPLIED>
@@ -1162,7 +1240,7 @@
<!ENTITY % xref.args "xrefnodename?, xrefinfoname?, xrefprinteddesc?,
xrefinfofile?, xrefprintedname?">
<!ENTITY % xref.attr
- "%spacesattr;
+ "%spacesafterincmdattr;
label CDATA #IMPLIED
manual CDATA #IMPLIED">
@@ -1177,6 +1255,8 @@
%xref.attr;>
<!ELEMENT xrefnodename (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST xrefnodename
+ %spacesattr;>
<!ELEMENT xrefinfoname (#PCDATA | %Inline.phrase;)*>
<!ATTLIST xrefinfoname
%spacesattr;>
@@ -1194,6 +1274,8 @@
<!ATTLIST inforef
%xref.attr;>
<!ELEMENT inforefnodename (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST inforefnodename
+ %spacesattr;>
<!ELEMENT inforefrefname (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inforefrefname
%spacesattr;>
@@ -1205,16 +1287,18 @@
<!ATTLIST email
%spacesattr;>
<!ELEMENT emailaddress (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST emailaddress
+ %spacesattr;>
<!ELEMENT emailname (#PCDATA | %Inline.phrase;)*>
<!ATTLIST emailname
%spacesattr;>
<!ELEMENT uref (urefurl, urefdesc?, urefreplacement?)>
<!ATTLIST uref
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT url (urefurl, urefdesc?, urefreplacement?)>
<!ATTLIST url
- %spacesattr;>
+ %spacesafterincmdattr;>
<!ELEMENT urefurl (#PCDATA | %Inline.phrase;)*>
<!ELEMENT urefdesc (#PCDATA | %Inline.phrase;)*>
<!ATTLIST urefdesc
@@ -1223,7 +1307,7 @@
<!ELEMENT footnote (%block;)*>
<!ATTLIST footnote
- %spacesattr;>
+ %spacesafterincmdattr;>
<!-- deprecated -->
@@ -1267,22 +1351,40 @@
%indexcmdattr;
command CDATA #REQUIRED>
<!ELEMENT cindex (indexterm)>
-<!ATTLIST cindex
+<!ATTLIST cindex
+ %indexcmdattr;>
+<!ELEMENT cpindex (indexterm)>
+<!ATTLIST cpindex
%indexcmdattr;>
<!ELEMENT findex (indexterm)>
-<!ATTLIST findex
+<!ATTLIST findex
+ %indexcmdattr;>
+<!ELEMENT fnindex (indexterm)>
+<!ATTLIST fnindex
%indexcmdattr;>
<!ELEMENT kindex (indexterm)>
-<!ATTLIST kindex
+<!ATTLIST kindex
+ %indexcmdattr;>
+<!ELEMENT kyindex (indexterm)>
+<!ATTLIST kyindex
%indexcmdattr;>
<!ELEMENT pindex (indexterm)>
-<!ATTLIST pindex
+<!ATTLIST pindex
+ %indexcmdattr;>
+<!ELEMENT pgindex (indexterm)>
+<!ATTLIST pgindex
%indexcmdattr;>
<!ELEMENT tindex (indexterm)>
-<!ATTLIST tindex
+<!ATTLIST tindex
+ %indexcmdattr;>
+<!ELEMENT tpindex (indexterm)>
+<!ATTLIST tpindex
%indexcmdattr;>
<!ELEMENT vindex (indexterm)>
-<!ATTLIST vindex
+<!ATTLIST vindex
+ %indexcmdattr;>
+<!ELEMENT vrindex (indexterm)>
+<!ATTLIST vrindex
%indexcmdattr;>
<!ELEMENT subentry (#PCDATA | %Inline.indexentryline;)*>
<!ATTLIST subentry
@@ -1301,7 +1403,7 @@
<!ELEMENT accent (#PCDATA | accent | dotless)*>
<!ATTLIST accent
%bracketedattr;
- %spacesattr;
+ %spacesaftercmdattr;
type CDATA #REQUIRED>
<!ELEMENT bye EMPTY>
@@ -1311,6 +1413,8 @@
command CDATA #REQUIRED>
<!ELEMENT dotless (#PCDATA)>
+<!ATTLIST dotless
+ %spacesaftercmdattr;>
<!ELEMENT spacecmd EMPTY>
<!ATTLIST spacecmd
@@ -1319,6 +1423,8 @@
<!ELEMENT today EMPTY>
<!ELEMENT U (#PCDATA)>
+<!ATTLIST U
+ %spacesattr;>
<!-- emacs-page
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: util/texinfo.dtd: fix menuleadingtext mixed content specification,
Patrice Dumas <=