branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (%commands

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (%commands_for

From:	Patrice Dumas
Subject:	branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (%commands_formatting): format @\| as divideheading element. * util/texinfo.dtd: add divideheading. Add heading marks, such as thischapter. Allow everyheading and similar to contain simple line text and heading marks.
Date:	Sat, 21 Aug 2021 06:04:04 -0400
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 5d6e9a1  * tp/Texinfo/Convert/TexinfoXML.pm (%commands_formatting): 
format @| as divideheading element. * util/texinfo.dtd: add divideheading.  Add 
heading marks, such as thischapter.  Allow everyheading and similar to contain 
simple line text and heading marks.
5d6e9a1 is described below

commit 5d6e9a16947bd6e95946687fa01cdc5141fa1deb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 21 12:03:53 2021 +0200

    * tp/Texinfo/Convert/TexinfoXML.pm (%commands_formatting):
    format @| as divideheading element.
    * util/texinfo.dtd: add divideheading.  Add heading marks, such
    as thischapter.  Allow everyheading and similar to contain
    simple line text and heading marks.
---
 ChangeLog                                          |  8 ++++
 tp/Texinfo/Convert/TexinfoXML.pm                   |  2 +-
 tp/t/results/coverage/commands_in_math.pl          |  2 +-
 .../res_parser/formatting_xml/formatting.xml       | 16 ++++----
 util/texinfo.dtd                                   | 48 +++++++++++++++++-----
 5 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca63190..b17aa14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2021-08-21  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/TexinfoXML.pm (%commands_formatting):
+       format @| as divideheading element.
+       * util/texinfo.dtd: add divideheading.  Add heading marks, such
+       as thischapter.  Allow everyheading and similar to contain
+       simple line text and heading marks.
+
+2021-08-21  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/PlainTexinfo.pm (%defaults): set
        EXTENSION to texi.
 
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index d99d6ff..49708ed 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -70,7 +70,7 @@ our %commands_formatting = (
            "\t" => ['spacecmd', 'type', 'tab'],
            "\n" => ['spacecmd', 'type', 'nl'],
            '-' => 'hyphenbreak',  # hyphenation hint
-           '|' => '',  # used in formatting commands @evenfooting and friends
+           '|' => ['divideheading'],  # used in formatting commands 
@evenfooting and friends
            '/' => 'slashbreak',
            ':' => 'noeos',
            '!' => 'eosexcl',
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 349c1fb..35e9c91 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2863,7 +2863,7 @@ $result_converted{'xml'}->{'commands_in_math'} = '
 <accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> 
<accent type="tilde" bracketed="off">n</accent> <accent type="circ" 
bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="macr" bracketed="off">o</accent> <accent type="grave" 
bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> 
<dotless>j</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &lslash; <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil" 
bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent 
type="dotaccent">a</accent> <accent type="ring">a</accent> <accent 
type="tieaccent">a</accent>
 <accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent 
type="udotaccent">a</accent> <accent type="caron">a</accent> <accent 
type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
-&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak;  &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; 
&rbrace; &lbrace; &slashbreak;
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; 
&eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
 <today/>
 </displaymath>
 
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index df8d380..05c8518 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -939,7 +939,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <spacecmd type="tab"/>
 &arobase; followed by a new line
 <spacecmd type="nl"/><code>&arobase;-</code> &hyphenbreak;
-<code>&arobase;|</code> 
+<code>&arobase;|</code> <divideheading/>
 <code>&arobase;:</code> &noeos;
 <code>&arobase;!</code> &eosexcl;
 <code>&arobase;?</code> &eosquest;
@@ -1115,7 +1115,7 @@ After clickstyle &result;
 <accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> 
<accent type="tilde" bracketed="off">n</accent> <accent type="circ" 
bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="macr" bracketed="off">o</accent> <accent type="grave" 
bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> 
<dotless>j</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &lslash; <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil" 
bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent 
type="dotaccent">a</accent> <accent type="ring">a</accent> <accent 
type="tieaccent">a</accent>
 <accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent 
type="udotaccent">a</accent> <accent type="caron">a</accent> <accent 
type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
-&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak;  &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; 
&rbrace; &lbrace; &slashbreak;
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; 
&eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
 <today/>
 </displaymath>
 
@@ -1804,7 +1804,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <spacecmd type="tab"/>
 &arobase; followed by a new line
 <spacecmd type="nl"/><code>&arobase;-</code> &hyphenbreak;
-<code>&arobase;|</code> 
+<code>&arobase;|</code> <divideheading/>
 <code>&arobase;:</code> &noeos;
 <code>&arobase;!</code> &eosexcl;
 <code>&arobase;?</code> &eosquest;
@@ -1980,7 +1980,7 @@ After clickstyle &result;
 <accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> 
<accent type="tilde" bracketed="off">n</accent> <accent type="circ" 
bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="macr" bracketed="off">o</accent> <accent type="grave" 
bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> 
<dotless>j</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &lslash; <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil" 
bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent 
type="dotaccent">a</accent> <accent type="ring">a</accent> <accent 
type="tieaccent">a</accent>
 <accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent 
type="udotaccent">a</accent> <accent type="caron">a</accent> <accent 
type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
-&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak;  &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; 
&rbrace; &lbrace; &slashbreak;
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; 
&eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
 <today/>
 </displaymath>
 
@@ -2696,7 +2696,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <spacecmd type="tab"/>
 &arobase; followed by a new line
 <spacecmd type="nl"/><code>&arobase;-</code> &hyphenbreak;
-<code>&arobase;|</code> 
+<code>&arobase;|</code> <divideheading/>
 <code>&arobase;:</code> &noeos;
 <code>&arobase;!</code> &eosexcl;
 <code>&arobase;?</code> &eosquest;
@@ -2872,7 +2872,7 @@ After clickstyle &result;
 <accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> 
<accent type="tilde" bracketed="off">n</accent> <accent type="circ" 
bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="macr" bracketed="off">o</accent> <accent type="grave" 
bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> 
<dotless>j</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &lslash; <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil" 
bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent 
type="dotaccent">a</accent> <accent type="ring">a</accent> <accent 
type="tieaccent">a</accent>
 <accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent 
type="udotaccent">a</accent> <accent type="caron">a</accent> <accent 
type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
-&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak;  &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; 
&rbrace; &lbrace; &slashbreak;
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; 
&eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
 <today/>
 </displaymath>
 
@@ -3555,7 +3555,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> 
&linebreak;
 <spacecmd type="tab"/>
 &arobase; followed by a new line
 <spacecmd type="nl"/><code>&arobase;-</code> &hyphenbreak;
-<code>&arobase;|</code> 
+<code>&arobase;|</code> <divideheading/>
 <code>&arobase;:</code> &noeos;
 <code>&arobase;!</code> &eosexcl;
 <code>&arobase;?</code> &eosquest;
@@ -3731,7 +3731,7 @@ After clickstyle &result;
 <accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> 
<accent type="tilde" bracketed="off">n</accent> <accent type="circ" 
bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="macr" bracketed="off">o</accent> <accent type="grave" 
bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> 
<dotless>j</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent>
 &lslash; <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent> <accent type="cedil" 
bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent 
type="dotaccent">a</accent> <accent type="ring">a</accent> <accent 
type="tieaccent">a</accent>
 <accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent 
type="udotaccent">a</accent> <accent type="caron">a</accent> <accent 
type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
-&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak;  &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; 
&rbrace; &lbrace; &slashbreak;
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd 
type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; 
&eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
 <today/>
 </displaymath>
 <pre xml:space="preserve">
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 34b6f49..9157d1f 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -152,19 +152,26 @@
                           | dfn | cite | key | kbd | var | acronym | abbr
                           | indicateurl | w | asis | sub | sup "> 
 <!ENTITY % Inline.math "math | dmn">
-<!ENTITY % Inline.reference "xref | ref | pxref | inforef | email | uref | 
url">
+<!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 ">
 
 <!-- on lines -->
-<!ENTITY % Inline.linetext "%Inline.emphasize; | %Inline.misc; | %Inline.fonts;
-          | %Inline.markup; | %Inline.math; | %Inline.reference;
-          | %Inline.footnote;" >
+<!ENTITY % Inline.linesimpletext "%Inline.emphasize; | %Inline.misc; | 
%Inline.fonts;
+          | %Inline.markup; | %Inline.math; | %Inline.hyperreference">
+<!ENTITY % Inline.linetext "%Inline.linesimpletext | %Inline.reference;
+                            | %Inline.footnote;" >
 <!ENTITY % Inline.line "%Inline.linetext; | image">
 <!ENTITY % Inline.fullline "%Inline.line; | titlefont | anchor">
 
+<!-- on headings specification lines -->
+<!ENTITY % Inline.headingmark "divideheading | thischapter | thischaptername |
+                        | thischapternum | thisfile | thispage | thistitle">
+<!ENTITY % Inline.headingline "%Inline.linesimpletext | %Inline.headingmark">
+
 <!-- in paragraphs -->
 <!ENTITY % Inline.phrase
            "%Inline.line; | %ubiquitous.cmds;">
@@ -346,12 +353,24 @@
 <!ATTLIST headings
           %lineattr;
           value CDATA #REQUIRED>
-<!ELEMENT everyheading (#PCDATA)>
-<!ELEMENT everyfooting (#PCDATA)>
-<!ELEMENT evenheading (#PCDATA)>
-<!ELEMENT evenfooting (#PCDATA)>
-<!ELEMENT oddheading (#PCDATA)>
-<!ELEMENT oddfooting (#PCDATA)>
+<!ELEMENT everyheading        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST everyheading
+          %spacesattr;>
+<!ELEMENT everyfooting        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST everyfooting
+          %spacesattr;>
+<!ELEMENT evenheading        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST evenheading
+          %spacesattr;>
+<!ELEMENT evenfooting        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST evenfooting
+          %spacesattr;>
+<!ELEMENT oddheading        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST oddheading
+          %spacesattr;>
+<!ELEMENT oddfooting        (#PCDATA | %Inline.headingline;)*>
+<!ATTLIST oddfooting
+          %spacesattr;>
 <!ELEMENT vskip (#PCDATA)>
 <!ELEMENT smallbook       EMPTY>
 <!ATTLIST smallbook
@@ -444,6 +463,14 @@
 <!ELEMENT indent   EMPTY>
 <!ELEMENT noindent EMPTY>
 
+<!-- heading marks -->
+<!ELEMENT thischapter EMPTY>
+<!ELEMENT thischaptername EMPTY>
+<!ELEMENT thischapternum EMPTY>
+<!ELEMENT thisfile EMPTY>
+<!ELEMENT thispage EMPTY>
+<!ELEMENT thistitle EMPTY>
+
 <!-- emacs-page
 <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
                 (%section.all; | %main.content;)*) >
@@ -1267,6 +1294,7 @@
 <!ELEMENT linebreak EMPTY>
 <!ELEMENT noeos EMPTY>
 <!ELEMENT formfeed EMPTY>
+<!ELEMENT divideheading EMPTY>
 
 <!ENTITY tex        "<logo>TeX</logo>">
 <!ENTITY latex      "<logo>LaTeX</logo>">
[Prev in Thread]
Current Thread
[Next in Thread]
branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (%commands_formatting): format @| as divideheading element. * util/texinfo.dtd: add divideheading. Add heading marks, such as thischapter. Allow everyheading and similar to contain simple line text and heading marks., Patrice Dumas <=
Prev by Date: branch master updated: * tp/Texinfo/Convert/PlainTexinfo.pm (%defaults): set EXTENSION to texi.
Next by Date: branch master updated: Add a test of output of formatting.texi as texinfo. To test also format structure and --macro-expand.
Previous by thread: branch master updated: * tp/Texinfo/Convert/PlainTexinfo.pm (%defaults): set EXTENSION to texi.
Next by thread: branch master updated: Add a test of output of formatting.texi as texinfo. To test also format structure and --macro-expand.
Index(es):
- Date
- Thread