[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Fri, 18 Feb 2022 19:52:38 -0500 (EST) |
branch: master
commit 091f22068cc9a0bf838451b3bbd5891b8f45e709
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Feb 19 01:52:15 2022 +0100
* configure.ac (TEXINFO_DTD_VERSION), util/texinfo.dtd:
update the DTD with new @-commands (latex, displaymath,
subentry, seeentry, seealso). Remove definition. Some
fixes. Define lt and amp predefined entities exactly as
shown on the XML specification.
---
ChangeLog | 8 ++++
configure.ac | 2 +-
.../res_parser/formatting_xml/formatting.xml | 2 +-
util/texinfo.dtd | 48 ++++++++++++++++------
4 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d1f3737ef4..c75933dda4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-02-19 Patrice Dumas <pertusus@free.fr>
+
+ * configure.ac (TEXINFO_DTD_VERSION), util/texinfo.dtd:
+ update the DTD with new @-commands (latex, displaymath,
+ subentry, seeentry, seealso). Remove definition. Some
+ fixes. Define lt and amp predefined entities exactly as
+ shown on the XML specification.
+
2022-02-19 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Common.pm (%close_paragraph_commands),
diff --git a/configure.ac b/configure.ac
index 1e84d3fbec..6a5b46dd6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_CONFIG_SRCDIR([info/info.c])
# 3. It may be kept as is in case there were no change in the DTD
# between releases. This is rare, but has happened.
#
-TEXINFO_DTD_VERSION=6.8
+TEXINFO_DTD_VERSION=6.9
AC_SUBST([TEXINFO_DTD_VERSION])
# Package date.
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 5285d7eb5b..9b2b76bb86 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN"
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.9//EN"
"http://www.gnu.org/software/texinfo/dtd/6.9/texinfo.dtd";>
<texinfo>
<filename file="formatting.xml"></filename>
<preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index a112a56c90..2474c363e7 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -60,7 +60,7 @@
<!-- index entry commands -->
<!ENTITY % indexentry.cmds "cindex | findex | kindex | pindex | tindex
- | vindex | indexcommand">
+ | vindex | indexcommand | subentry">
<!-- API definition commands -->
<!ENTITY % def.cmds "deffn | defvr | deftypefn | deftypeop | deftypevr
@@ -68,7 +68,7 @@
| defspec | defvar | defopt | deftypefun | deftypevar
| defivar | deftypeivar | defmethod | deftypemethod">
-<!ENTITY % raw.cmds "html | tex | docbook | xml | macro | rmacro | ignore">
+<!ENTITY % raw.cmds "html | tex | latex | docbook | xml | macro | rmacro |
ignore">
<!-- Commands that appear everywhere, both with block and in paragraphs -->
<!-- include is in general absent, since it is replaced, but it is
@@ -84,7 +84,7 @@
| display | smalldisplay | copying | titlepage
| raggedright | flushleft | flushright
| itemize | enumerate | titlefont | center | group
- | table | vtable | ftable | multitable | definition
+ | table | vtable | ftable | multitable | displaymath
| image
| %def.cmds;
| %ubiquitous.cmds;
@@ -157,21 +157,22 @@
<!ENTITY % Inline.misc "click | clicksequence | logo | punct | spacecmd | today
| linebreak | accent | dotless | ctrl | inlineraw
| inlinefmt | inlinefmtifelse | inlineifclear
- | inlineifset | infoenclose | noeos | formfeed ">
+ | inlineifset | infoenclose | noeos | formfeed | U ">
<!-- on lines -->
<!ENTITY % Inline.linesimpletext "%Inline.emphasize; | %Inline.misc; |
%Inline.fonts;
- | %Inline.markup; | %Inline.math; | %Inline.hyperreference">
-<!ENTITY % Inline.linetext "%Inline.linesimpletext | %Inline.reference;
- | %Inline.footnote;" >
+ | %Inline.markup; | %Inline.math; | %Inline.hyperreference;">
+<!ENTITY % Inline.linetext "%Inline.linesimpletext; | %Inline.reference;
+ | %Inline.footnote;">
<!ENTITY % Inline.line "%Inline.linetext; | image">
+<!ENTITY % Inline.indexentryline "%Inline.line; | seealso | seeentry | sortas">
<!ENTITY % Inline.fullline "%Inline.line; | titlefont | anchor">
<!-- on headings specification lines -->
<!ENTITY % Inline.headingmark "divideheading | thischapter | thischaptername
| thischapternum | thissection | thissectionname | thissectionnum
| thisfile | thispage | thistitle">
-<!ENTITY % Inline.headingline "%Inline.linesimpletext | %Inline.headingmark">
+<!ENTITY % Inline.headingline "%Inline.linesimpletext; | %Inline.headingmark;">
<!-- in paragraphs -->
<!ENTITY % Inline.phrase
@@ -633,6 +634,9 @@
<!ELEMENT raggedright (%block; | exdent)*>
<!ATTLIST raggedright
%spacesblockattr;>
+<!ELEMENT displaymath (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST displaymath
+ %spacesblockattr;>
<!ELEMENT center (#PCDATA | %Inline.fullline;)*>
<!ATTLIST center
@@ -701,6 +705,9 @@
<!ELEMENT tex (%Raw.content;)*>
<!ATTLIST tex
%spacesblockattr;>
+<!ELEMENT latex (%Raw.content;)*>
+<!ATTLIST latex
+ %spacesblockattr;>
<!-- this may happen if xml is not expanded -->
<!ELEMENT xml (%Raw.content;)*>
<!ATTLIST xml
@@ -962,10 +969,6 @@
<!ATTLIST deftypemethodx
%spacesattr;>
-<!--
-<!ELEMENT definition (definitionterm | definitionitem | indexterm)+>
-<!ELEMENT definitionterm (%definition.args; | indexterm)+>
--->
<!ELEMENT definitionterm (indexterm?, (%definition.args;)+)>
<!ELEMENT definitionitem (%block;)*>
@@ -1230,7 +1233,7 @@
%lineattr;
from NMTOKEN #REQUIRED
to NMTOKEN #REQUIRED>
-<!ELEMENT indexterm (#PCDATA | %Inline.line;)*>
+<!ELEMENT indexterm (#PCDATA | %Inline.indexentryline;)*>
<!ATTLIST indexterm
index CDATA #IMPLIED
mergedindex CDATA #IMPLIED
@@ -1258,6 +1261,13 @@
<!ELEMENT vindex (indexterm)>
<!ATTLIST vindex
%indexcmdattr;>
+<!ELEMENT subentry (#PCDATA | %Inline.indexentryline;)*>
+<!ATTLIST subentry
+ %spacesattr;>
+<!ELEMENT sortas (#PCDATA | %Inline.line;)*>
+<!ELEMENT seeentry (#PCDATA | %Inline.line;)*>
+<!ELEMENT seealso (#PCDATA | %Inline.line;)*>
+
<!ELEMENT printindex EMPTY>
<!ATTLIST printindex
%lineattr;
@@ -1303,7 +1313,13 @@
<!ENTITY tex "<logo>TeX</logo>">
<!ENTITY latex "<logo>LaTeX</logo>">
<!ENTITY ellipsis "…">
+<!-- From the XML specification:
+ If the entities lt or amp are declared, they MUST be declared as internal
entities whose replacement text is a character reference to the respective
character (less-than sign or ampersand) being escaped; the double escaping is
REQUIRED for these entities so that references to them produce a well-formed
result.
+ LibXML error: invalid redeclaration of predefined entity
<!ENTITY lt "<">
+Use exactly what is on the XML specification
+-->
+<!ENTITY lt "&#60;">
<!ENTITY gt ">">
<!ENTITY bullet "•">
<!ENTITY copyright "©">
@@ -1314,7 +1330,13 @@
<!ENTITY linebreak "<linebreak/>">
<!ENTITY dots "<punct end-of-sentence='no'>…</punct>">
<!ENTITY enddots "<punct end-of-sentence='yes'>…</punct>">
+<!-- From the XML specification:
+ If the entities lt or amp are declared, they MUST be declared as internal
entities whose replacement text is a character reference to the respective
character (less-than sign or ampersand) being escaped; the double escaping is
REQUIRED for these entities so that references to them produce a well-formed
result.
+ LibXML error: invalid redeclaration of predefined entity
<!ENTITY amp "&">
+Use exactly what is on the XML specification
+-->
+<!ENTITY amp "&#38;">
<!ENTITY lsquo "‘">
<!ENTITY textlsquo "‘">
<!ENTITY rsquo "’">