From 743d0aa7cf7c48fec70258f793abcdbf47d27f9a Mon Sep 17 00:00:00 2001 From: John Fieber Date: Tue, 17 Dec 1996 01:48:33 +0000 Subject: [PATCH] Whitespace handling in , and elements will be changing slightly in such a way that missing end tags might cause rude surprises, so make end tags manditory and update the existing transpecs to conform. 2.2 fodder --- share/sgml/transpec/docbook-html.ts | 344 +++++++++---------- share/sgml/transpec/linuxdoc-html.ts | 476 +++++++++++--------------- share/sgml/transpec/linuxdoc-latex.ts | 272 +++++++-------- share/sgml/transpec/linuxdoc-roff.ts | 434 +++++++++++------------ share/sgml/transpec/transpec.dtd | 8 +- 5 files changed, 700 insertions(+), 834 deletions(-) diff --git a/share/sgml/transpec/docbook-html.ts b/share/sgml/transpec/docbook-html.ts index 185030b18b82..d3cb25ccb081 100644 --- a/share/sgml/transpec/docbook-html.ts +++ b/share/sgml/transpec/docbook-html.ts @@ -1,6 +1,6 @@ @@ -213,9 +213,9 @@ ${_attval ID &r.astart;} BLOCKQUOTE ^<BLOCKQUOTE> -${_attval ID &r.astart;}^ +${_attval ID &r.astart;}^ ^${_attval ID &r.aend;} -</BLOCKQUOTE>^ +</BLOCKQUOTE>^ @@ -224,15 +224,15 @@ ${_attval ID &r.astart;}^ ^<!-- Generated on ${date} using ${transpec} --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<HTML><TITLE>${_followrel descendant TITLE &r.pass;}</TITLE><BODY>^ -^</BODY></HTML> +<HTML><TITLE>${_followrel descendant TITLE &r.pass;}</TITLE><BODY>^ +^</BODY></HTML> BOOKBIBLIO -^<H1>${_followrel child TITLE &r.pass;}</H1> +^<H1>${_followrel child TITLE &r.pass;}</H1> @@ -244,8 +244,8 @@ ${_attval ID &r.astart;}^ BRIDGEHEAD -^<H4><EM> -</EM></H4>^ +^<H4><EM> +</EM></H4>^ @@ -260,8 +260,8 @@ ${_attval ID &r.astart;}^ CHAPTER ^<!-- Start CHAPTER ${chapnum} (${ID}): -${_followrel child TITLE &r.pass;} -->^ -^<!-- End CHAPTER -->^ +${_followrel child TITLE &r.pass;} -->^ +^<!-- End CHAPTER -->^ chapnum sect1num 1 @@ -270,16 +270,16 @@ ${_followrel child TITLE &r.pass;} -->^ CITATION -<CITE> -</CITE> +<CITE> +</CITE> CITEREFENTRY -<TT> -</TT> +<TT> +</TT> @@ -331,8 +331,8 @@ ${_followrel child TITLE &r.pass;} -->^ COMPUTEROUTPUT -<CODE> -</CODE> +<CODE> +</CODE> @@ -427,16 +427,16 @@ ${_followrel child TITLE &r.pass;} -->^ EMAIL -<A HREF="mailto:${_action &r.pass;}"> -</A> +<A HREF="mailto:${_action &r.pass;}"> +</A> EMPHASIS -<EM> -</EM> +<EM> +</EM> @@ -444,16 +444,16 @@ ${_followrel child TITLE &r.pass;} -->^ ENTRY ROW THEAD -^<TH> -</TH>^ +^<TH> +</TH>^ ENTRY -^<TD> -</TD>^ +^<TD> +</TD>^ @@ -471,8 +471,8 @@ ${_followrel child TITLE &r.pass;} -->^ EQUATION ^<HR>${_attval ID &r.astart;}<STRONG>${_gi M} ${eqnum}:</STRONG> -${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ -^<HR>^ +${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ +^<HR>^ eqnum @@ -491,8 +491,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ EXAMPLE ^<HR>${_attval ID &r.astart;}<STRONG>${_gi M} ${exnum}:</STRONG> -${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ -^<HR>^ +${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ +^<HR>^ exnum @@ -506,8 +506,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ FIGURE ^<HR>${_attval ID &r.astart;}<STRONG>${_gi M} ${fignum}:</STRONG> -${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ -^<HR>^ +${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ +^<HR>^ fignum @@ -515,24 +515,24 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ FILENAME -<B> -</B> +<B> +</B> FIRSTNAME -^ -^ +^ +^ FIRSTTERM -<STRONG> -</STRONG> +<STRONG> +</STRONG> @@ -549,8 +549,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ FOREIGNPHRASE -<EM> -</EM> +<EM> +</EM> @@ -588,16 +588,16 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ GLOSSARY <H1>${_find gi TITLE &r.pass;}</H1> -<DL>^ -</DL> +<DL>^ +</DL> GLOSSDEF -<DD> -</DD>^ +<DD> +</DD>^ @@ -629,15 +629,15 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ GLOSSTERM -^<DT><STRONG> -</STRONG></DT> +^<DT><STRONG> +</STRONG></DT> GRAPHIC -^<P><A HREF="${_filename}">[image]</A></P>^ +^<P><A HREF="${_filename}">[image]</A></P>^ @@ -708,8 +708,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ INFORMALTABLE -^<TABLE>^ -^</TABLE>^ +^<TABLE>^ +^</TABLE>^ @@ -758,17 +758,17 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA </P> -<UL>^ +<UL>^ ^</UL> -<P> +<P> ITEMIZEDLIST -^<UL>^ -^</UL>^ +^<UL>^ +^</UL>^ @@ -805,8 +805,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ LINEANNOTATION -<EM> -</EM> +<EM> +</EM> @@ -819,16 +819,16 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ LISTITEM VARLISTENTRY -^<DD> -</DD>^ +^<DD> +</DD>^ LISTITEM -^<LI> -</LI>^ +^<LI> +</LI>^ @@ -841,8 +841,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ LITERAL -<CODE> -</CODE> +<CODE> +</CODE> @@ -851,17 +851,17 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA </P> -<PRE>^ +<PRE>^ ^</PRE> -<P> +<P> LITERALLAYOUT -^<PRE> -^</PRE> +^<PRE> +^</PRE> @@ -878,8 +878,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ MANVOLNUM -( -) +( +) @@ -896,8 +896,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ MEMBER -^<LI> -</LI>^ +^<LI> +</LI>^ @@ -993,17 +993,17 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA </P> -<OL>^ +<OL>^ ^</OL> -<P> +<P> ORDEREDLIST -^<OL>^ -^</OL>^ +^<OL>^ +^</OL>^ @@ -1041,8 +1041,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA LISTITEM|VARLISTENTRY|GLOSSDEF -^<P> -</P> +^<P> +</P> @@ -1055,7 +1055,7 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA -^<P> +^<P> @@ -1135,17 +1135,17 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA </P> -<BLOCKQUOTE><PRE>^ +<BLOCKQUOTE><PRE>^ ^</PRE></BLOCKQUOTE> -<P> +<P> PROGRAMLISTING -^<PRE>^ -^</PRE>^ +^<PRE>^ +^</PRE>^ @@ -1157,8 +1157,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PUBDATE -<P> -</P> +<P> +</P> @@ -1180,8 +1180,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ QUOTE -`` -'' +`` +'' @@ -1198,7 +1198,7 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ REFENTRY -^<!-- Reference Entry --> +^<!-- Reference Entry --> @@ -1211,8 +1211,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ REFENTRYTITLE -<HR><H2>${_followrel ancestor REFENTRY 4} -${_followrel ancestor REFENTRY 5}</H2> +<HR><H2>${_followrel ancestor REFENTRY 4} +${_followrel ancestor REFENTRY 5}</H2> @@ -1236,8 +1236,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ REFNAME -^<STRONG> -^</STRONG> -^ +^<STRONG> +^</STRONG> -^ @@ -1245,8 +1245,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ REFNAMEDIV ^<H3>Name</H3> -<P> -^</P>^ +<P> +^</P>^ @@ -1283,8 +1283,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ REPLACEABLE -<i> -</i> +<i> +</i> @@ -1316,8 +1316,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ ROW -^<TR valign="top">^ -^</TR>^ +^<TR valign="top">^ +^</TR>^ @@ -1456,8 +1456,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class PARAMENTITY -<CODE>% -</CODE> +<CODE>% +</CODE> @@ -1465,8 +1465,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class GENENTITY -<CODE>& -;</CODE> +<CODE>& +;</CODE> @@ -1474,8 +1474,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class STARTTAG -<CODE>&lt; -></CODE> +<CODE>&lt; +></CODE> @@ -1483,8 +1483,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class ENDTAG -<CODE>&lt;/ -></CODE> +<CODE>&lt;/ +></CODE> @@ -1492,8 +1492,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class PI -<CODE>&lt;? -></CODE> +<CODE>&lt;? +></CODE> @@ -1501,8 +1501,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG class PI -<CODE>&lt;-- ---&lt;/CODE> +<CODE>&lt;-- +--&lt;/CODE> @@ -1510,8 +1510,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SGMLTAG -<CODE>&lt; -&gt;</CODE> +<CODE>&lt; +&gt;</CODE> @@ -1537,8 +1537,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SIMPLELIST -^<UL>^ -^</UL>^ +^<UL>^ +^</UL>^ @@ -1585,8 +1585,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SUBTITLE -^<P><EM> -</EM></P>^ +^<P><EM> +</EM></P>^ @@ -1598,8 +1598,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ SURNAME -^ -^ +^ +^ @@ -1623,17 +1623,17 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ PARA </P> -<BLOCKQUOTE><PRE>^ +<BLOCKQUOTE><PRE>^ ^</PRE></BLOCKQUOTE> -<P> +<P> SYNOPSIS -^<PRE>^ -^</PRE>^ +^<PRE>^ +^</PRE>^ @@ -1647,8 +1647,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}^ frame none ^${_attval ID &r.astart;}<STRONG>${_gi M} ${tabnum}:</STRONG> -${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE>^ -^</TABLE>^ +${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE>^ +^</TABLE>^ tabnum @@ -1657,8 +1657,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE>^ TABLE ^${_attval ID &r.astart;}<STRONG>${_gi M} ${tabnum}:</STRONG> -${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border">^ -^</TABLE>^ +${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border">^ +^</TABLE>^ tabnum @@ -1671,8 +1671,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TERM -^<DT> -</DT>^ +^<DT> +</DT>^ @@ -1714,8 +1714,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE PREFACE -^<H1> -</H1>^ +^<H1> +</H1>^ @@ -1724,8 +1724,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border SECT1 ancestor PREFACE -^<H2> -</H2>^ +^<H2> +</H2>^ @@ -1734,8 +1734,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border SECT2 ancestor PREFACE -^<H3> -</H3>^ +^<H3> +</H3>^ @@ -1744,8 +1744,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border SECT3 ancestor PREFACE -^<H4> -</H4>^ +^<H4> +</H4>^ @@ -1765,8 +1765,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE CHAPTER -^<H1>${_followrel parent CHAPTER 4}Chapter ${chapnum}:<BR>^ -${_followrel parent CHAPTER 5}</H1>^ +^<H1>${_followrel parent CHAPTER 4}Chapter ${chapnum}:<BR>^ +${_followrel parent CHAPTER 5}</H1>^ @@ -1774,8 +1774,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE ^REF.* -^<H3> -^</H3> +^<H3> +^</H3> @@ -1783,8 +1783,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE SECT1 -^<H2>${_followrel parent SECT1 4}${chapnum}.${sect1num}^ -${_followrel parent SECT1 5}</H2>^ +^<H2>${_followrel parent SECT1 4}${chapnum}.${sect1num}^ +${_followrel parent SECT1 5}</H2>^ @@ -1792,8 +1792,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE SECT2 -^<H3>${_followrel parent SECT2 4}${chapnum}.${sect1num}.${sect2num}^ -${_followrel parent SECT2 5}</H3>^ +^<H3>${_followrel parent SECT2 4}${chapnum}.${sect1num}.${sect2num}^ +${_followrel parent SECT2 5}</H3>^ @@ -1801,8 +1801,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE SECT3 -^<H4>${_followrel parent SECT3 4}${chapnum}.${sect1num}.${sect2num}.${sect3num}^ -${_followrel parent SECT1 5}</H4>^ +^<H4>${_followrel parent SECT3 4}${chapnum}.${sect1num}.${sect2num}.${sect3num}^ +${_followrel parent SECT1 5}</H4>^ @@ -1810,8 +1810,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE SECT4 -^<H4>${_followrel parent SECT4 4} -${_followrel parent SECT4 5}</H4>^ +^<H4>${_followrel parent SECT4 4} +${_followrel parent SECT4 5}</H4>^ @@ -1819,8 +1819,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TITLE SECT5 -^<H4>${_followrel parent SECT5 4} -${_followrel parent SECT5 5}</H4>^ +^<H4>${_followrel parent SECT5 4} +${_followrel parent SECT5 5}</H4>^ @@ -1917,7 +1917,7 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border TRADEMARK -(TM) +(TM) @@ -1929,16 +1929,16 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border ULINK -<A href="${URL}"> -</A> +<A href="${URL}"> +</A> USERINPUT -<B> -</B> +<B> +</B> @@ -1951,16 +1951,16 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border VARIABLELIST PARA -</P>^<DL>^ -^</DL>^<P> +</P>^<DL>^ +^</DL>^<P> VARIABLELIST -^<DL>^ -^</DL>^ +^<DL>^ +^</DL>^ @@ -1994,15 +1994,15 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border XREF -<A HREF="#${LINKEND}"><EM>${_chasetogi TITLE &r.pass}</EM></A> +<A HREF="#${LINKEND}"><EM>${_chasetogi TITLE &r.pass}</EM></A> YEAR -^ -^ +^ +^ @@ -2016,7 +2016,7 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _name -<A NAME="${ID id}"> +<A NAME="${ID id}"> all @@ -2024,7 +2024,7 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _name-end -</A> +</A> all @@ -2032,14 +2032,14 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _anchor-start -${_attval ID &r.astart;} +${_attval ID &r.astart;} _anchor-end -${_attval ID &r.aend;} +${_attval ID &r.aend;} @@ -2054,8 +2054,8 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _admonition ^<TABLE border="border"> - <TR><TD><P align="center"><STRONG>${_attval ID &r.astart;}${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}</STRONG></P>^ -^</TD></TR></TABLE>^ + <TR><TD><P align="center"><STRONG>${_attval ID &r.astart;}${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}</STRONG></P>^ +^</TD></TR></TABLE>^ @@ -2063,15 +2063,15 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _admonition ^<TABLE border="border"> - <TR><TD>^ -^</TD></TR></TABLE>^ + <TR><TD>^ +^</TD></TR></TABLE>^ _titletext -${_attval ID &r.astart;}${ttext}${_followrel child TITLE &r.pass;}${_attval ID &r.aend;} +${_attval ID &r.astart;}${ttext}${_followrel child TITLE &r.pass;}${_attval ID &r.aend;} all @@ -2079,14 +2079,14 @@ ${_followrel child TITLE &r.pass;}${_attval ID &r.aend;}<TABLE border="border _Start -^<!-- Magic _Start GI -->^ +^<!-- Magic _Start GI -->^ _End -^<!-- Magic _End GI -->^ +^<!-- Magic _End GI -->^ diff --git a/share/sgml/transpec/linuxdoc-html.ts b/share/sgml/transpec/linuxdoc-html.ts index ba4ca01a8ac3..3aa32c32a9a1 100644 --- a/share/sgml/transpec/linuxdoc-html.ts +++ b/share/sgml/transpec/linuxdoc-html.ts @@ -1,6 +1,6 @@ +&cmap; +&sdata; - -&sdata; - + LINUXDOC - - ARTICLE - - - REPORT - - - BOOK - - - NOTES - - - MANPAGE - - - TITLEPAG - - - TITLE - ^<@@title> - + ^<@@title> SUBTITLE - ^<h2> - </h2>^ + ^<h2> + </h2>^ DATE - - AUTHOR - - - NAME - ^<h2> - </h2> + ^<h2> + </h2> AND - and - + and THANKS - ^Thanks - + ^Thanks INST - ^<h3> - </h3>^ + ^<h3> + </h3>^ NEWLINE - <br> + <br> LABEL - ^<@@label>${ID}^ + ^<@@label>${ID}^ HEADER - - - LHEAD - ^<!-- - -->^ + ^<!-- + -->^ RHEAD - ^<!-- - -->^ + ^<!-- + -->^ COMMENT - ^<h4>Comment</h4>^ - + ^<h4>Comment</h4>^ ABSTRACT - ^<p><hr><em> - </em><hr></p>^ + ^<p><hr><em> + </em><hr></p>^ APPENDIX - ^<h2>Appendix</h2>^ - + ^<h2>Appendix</h2>^ TOC - - - LOF - - - LOT - - - PART - ^<@@part> - + ^<@@part> CHAPT - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ SECT - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ SECT1 - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ SECT2 - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ SECT3 - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ SECT4 - ^<@@sect> - ^<@@endsect>^ + ^<@@sect> + ^<@@endsect>^ HEADING - ^<@@head> - ^<@@endhead>^ + ^<@@head> + ^<@@endhead>^ P - <p> - </p>^ + <p> + </p>^ ITEMIZE - ^<ul>^ - ^</ul>^ + ^<ul>^ + ^</ul>^ ENUM - ^<ol>^ - ^</ol>^ + ^<ol>^ + ^</ol>^ DESCRIP - ^<dl>^ - ^</dl>^ + ^<dl>^ + ^</dl>^ ITEM - ^<li> - </li>^ + ^<li> + </li>^ TAG - <dt><b> - </b><dd> + <dt><b> + </b><dd> CITE - [<i>${ID}</i>] - + [<i>${ID}</i>] NCITE - [<i>${NOTE} (${ID})</i>] - + [<i>${NOTE} (${ID})</i>] FOOTNOTE - ^<sl> - </sl>^ + ^<sl> + </sl>^ SQ - " - " + " + " LQ - ^<LQ>^ - ^</LQ>^ + ^<LQ>^ + ^</LQ>^ EM - <em> - </em> + <em> + </em> BF - <b> - </b> + <b> + </b> IT - <i> - </i> + <i> + </i> SF - <SF> - </SF> + <SF> + </SF> SL - <i> - </i> + <i> + </i> TT - <code> - </code> + <code> + </code> @@ -470,14 +423,14 @@ URL HTMLURL NAME . - <A href="${URL}">${NAME}</A> + <A href="${URL}">${NAME}</A> URL HTMLURL - <A href="${URL}">${URL}</A> + <A href="${URL}">${URL}</A> @@ -485,587 +438,568 @@ REF NAME . - -^<@@ref>${ID} -${NAME}</A> + ^<@@ref>${ID} +${NAME}</A> REF - -^<@@ref>${ID} -${ID}</A> + ^<@@ref>${ID} +${ID}</A> HREF - ^<@@ref>${ID}^ - + ^<@@ref>${ID}^ PAGEREF - ^<@@ref>${ID}^ - + ^<@@ref>${ID}^ X - - - MC - <MC> - </MC> + <MC> + </MC> BIBLIO - ^<BIBLIO STYLE="${STYLE}" FILES="${FILES}">^ - + ^<BIBLIO STYLE="${STYLE}" FILES="${FILES}">^ CODE - ^<hr><pre>^ - ^</pre><hr>^ + ^<hr><pre>^ + ^</pre><hr>^ VERB - ^<pre>^ - ^</pre>^ + ^<pre>^ + ^</pre>^ TSCREEN - ^<blockquote><code>^ - ^</code></blockquote>^ + ^<blockquote><code>^ + ^</code></blockquote>^ QUOTE - ^<blockquote>^ - ^</blockquote>^ + ^<blockquote>^ + ^</blockquote>^ DEF - ^<DEF> - ^</DEF>^ + ^<DEF> + ^</DEF>^ PROP - ^<PROP> - ^</PROP>^ + ^<PROP> + ^</PROP>^ LEMMA - ^<LEMMA> - ^</LEMMA>^ + ^<LEMMA> + ^</LEMMA>^ COROLL - ^<COROLL> - ^</COROLL>^ + ^<COROLL> + ^</COROLL>^ PROOF - ^<PROOF> - ^</PROOF>^ + ^<PROOF> + ^</PROOF>^ THEOREM - ^<THEOREM> - ^</THEOREM>^ + ^<THEOREM> + ^</THEOREM>^ THTAG - <THTAG> - </THTAG> + <THTAG> + </THTAG> F - <F> - </F> + <F> + </F> DM - ^<DM>^ - ^</DM>^ + ^<DM>^ + ^</DM>^ EQ - ^<EQ>^ - ^</EQ>^ + ^<EQ>^ + ^</EQ>^ FR - <FR> - </FR> + <FR> + </FR> NU - <NU> - </NU> + <NU> + </NU> DE - <DE> - </DE> + <DE> + </DE> LIM - <LIM> - </LIM> + <LIM> + </LIM> OP - <OP> - </OP> + <OP> + </OP> LL - <LL> - </LL> + <LL> + </LL> UL - <UL> - </UL> + <UL> + </UL> OPD - <OPD> - </OPD> + <OPD> + </OPD> PR - <PR> - </PR> + <PR> + </PR> IN - <INT> - </INT> + <INT> + </INT> SUM - <SUM> - </SUM> + <SUM> + </SUM> ROOT - <ROOT> - </ROOT> + <ROOT> + </ROOT> AR - <AR> - </AR> + <AR> + </AR> ARR - <ARR> - + <ARR> ARC - <ARC> - + <ARC> SUP - <SUP> - </SUP> + <SUP> + </SUP> INF - <INF> - </INF> + <INF> + </INF> UNL - <UNL> - </UNL> + <UNL> + </UNL> OVL - <OVL> - </OVL> + <OVL> + </OVL> RF - <RF> - </RF> + <RF> + </RF> V - <V> - </V> + <V> + </V> FI - <FI> - </FI> + <FI> + </FI> PHR - <PHR> - </PHR> + <PHR> + </PHR> TU - <TU> - + <TU> FIGURE - ^<FIGURE>^ - ^</FIGURE>^ + ^<FIGURE>^ + ^</FIGURE>^ EPS - ^<EPS FILE="${FILE}">^ - + ^<EPS FILE="${FILE}">^ PH - ^<PH VSPACE="${VSPACE}">^ - + ^<PH VSPACE="${VSPACE}">^ CAPTION - ^<CAPTION> - </CAPTION>^ + ^<CAPTION> + </CAPTION>^ TABLE - ^<TABLE>^ - ^</TABLE>^ + ^<TABLE>^ + ^</TABLE>^ TABULAR - ^<br>^ - ^ + ^<br>^ + ^ ROWSEP - <br>^ - + <br>^ COLSEP - - - HLINE - ^<hr>^ - + ^<hr>^ SLIDES - ^<SLIDES>^ - ^</SLIDES>^ + ^<SLIDES>^ + ^</SLIDES>^ SLIDE - ^<SLIDE>^ - ^</SLIDE>^ + ^<SLIDE>^ + ^</SLIDE>^ LETTER - ^<LETTER OPTS="${OPTS}">^ - ^</LETTER>^ + ^<LETTER OPTS="${OPTS}">^ + ^</LETTER>^ TELEFAX - ^<TELEFAX OPTS="${OPTS}">^ - ^</TELEFAX>^ + ^<TELEFAX OPTS="${OPTS}">^ + ^</TELEFAX>^ OPENING - ^<OPENING> - </OPENING>^ + ^<OPENING> + </OPENING>^ FROM - ^<FROM> - ^</FROM>^ + ^<FROM> + ^</FROM>^ TO - ^<TO> - - ^</TO>^ + ^<TO> + ^</TO>^ ADDRESS - ^<ADDRESS>^ - ^</ADDRESS>^ + ^<ADDRESS>^ + ^</ADDRESS>^ EMAIL - ^<@@email> - <@@endemail>^ + ^<@@email> + <@@endemail>^ PHONE - ^<PHONE> - </PHONE>^ + ^<PHONE> + </PHONE>^ FAX - ^<FAX> - </FAX>^ + ^<FAX> + </FAX>^ SUBJECT - ^<SUBJECT> - </SUBJECT>^ + ^<SUBJECT> + </SUBJECT>^ SREF - ^<SREF> - </SREF>^ + ^<SREF> + </SREF>^ RREF - ^<RREF> - </RREF>^ + ^<RREF> + </RREF>^ RDATE - ^<RDATE> - </RDATE>^ + ^<RDATE> + </RDATE>^ CLOSING - ^<CLOSING> - </CLOSING>^ + ^<CLOSING> + </CLOSING>^ CC - ^<CC> - </CC>^ + ^<CC> + </CC>^ ENCL - ^<ENCL> - </ENCL>^ + ^<ENCL> + </ENCL>^ PS - ^<PS>^ - ^</PS>^ + ^<PS>^ + ^</PS>^ diff --git a/share/sgml/transpec/linuxdoc-latex.ts b/share/sgml/transpec/linuxdoc-latex.ts index ad7511f2ea09..3772b6c6a9bc 100644 --- a/share/sgml/transpec/linuxdoc-latex.ts +++ b/share/sgml/transpec/linuxdoc-latex.ts @@ -1,6 +1,6 @@ +&cmap; +&sdata; - -&sdata; - + LINUXDOC - -% Generated ${date} using ${transpec} -% by ${user}@${host} +% Generated ${date} using ${transpec} +% by ${user}@${host} @@ -117,9 +114,6 @@ MANPAGE - - - @@ -127,7 +121,7 @@ TITLEPAG ^\begin{document} -\maketitle^ +\maketitle^ @@ -157,9 +151,6 @@ NAME - - - @@ -173,8 +164,8 @@ THANKS -\thanks{ -} +\thanks{ +} @@ -197,15 +188,14 @@ NEWLINE -\\ - +\\ LABEL -\label{${ID}} +\label{${ID}} @@ -219,8 +209,8 @@ LHEAD -{ -} +{ +} @@ -235,8 +225,8 @@ COMMENT -{\tt -} +{\tt +} @@ -322,14 +312,13 @@ SECT4 ^\subparagraph - HEADING -{ +{ } @@ -395,48 +384,48 @@ CITE -\cite{${ID} -} +\cite{${ID} +} NCITE -\cite\[${NOTE}\]{${ID} -} +\cite\[${NOTE}\]{${ID} +} IDX -\idx{ -} +\idx{ +} CDX -\cdx{ -} +\cdx{ +} FOOTNOTE -\footnote{ -} +\footnote{ +} SQ -`` -'' +`` +'' @@ -451,56 +440,56 @@ EM -\emph{ -} +\emph{ +} BF -{\bf -} +{\bf +} IT -\textit{ -} +\textit{ +} SF -\textsf{ -} +\textsf{ +} SL -\textsl{ -} +\textsl{ +} RM -\textrm{ -} +\textrm{ +} TT -\texttt{ -} +\texttt{ +} @@ -515,16 +504,14 @@ REF -\ref{${ID}} - +\ref{${ID}} PAGEREF -\pageref{${ID}} - +\pageref{${ID}} @@ -548,24 +535,17 @@ HTMLURL -${NAME} - +${NAME} X - - - MC - - - @@ -625,304 +605,286 @@ PROP -^\begin{proposition}^ -^\end{proposition}^ +^\begin{proposition}^ +^\end{proposition}^ LEMMA -^\begin{lemma} -^\end{lemma}^ +^\begin{lemma} +^\end{lemma}^ COROLL -^\begin{corollary} -^\end{corollary}^ +^\begin{corollary} +^\end{corollary}^ PROOF -^{\noindent{\bf Proof.} ^ -^} +^{\noindent{\bf Proof.} ^ +^} THEOREM -^\begin{theorem} -^\end{theorem}^ +^\begin{theorem} +^\end{theorem}^ THTAG -\[ -\]^ +\[ +\]^ F -\$ -\$ +\$ +\$ DM -^\\[ -\\]^ +^\\[ +\\]^ EQ -^\begin{equation}^ -^\end{equation}^ +^\begin{equation}^ +^\end{equation}^ FR -\frac - +\frac NU -{ -} +{ +} DE -{ -} +{ +} LIM - - - OP - - - LL -_{ -} +_{ +} UL -^{ -} +^{ +} OPD - - - PR -\prod - +\prod IN -\int - +\int SUM -\sum - +\sum ROOT -\sqrt\[[n]\]{ -} +\sqrt\[[n]\]{ +} AR -^\begin{array}{[ca]}^ -^\end{array}^ +^\begin{array}{[ca]}^ +^\end{array}^ ARR -\\ ^ - +\\ ^ ARC -& - +& SUP -^{ -} +^{ +} INF -_{ -} +_{ +} UNL -\underline{ -} +\underline{ +} OVL -\overline{ -} +\overline{ +} RF -\mbox{\tt -} +\mbox{\tt +} V -\vec{ -} +\vec{ +} FI -{\cal -} +{\cal +} PHR -{\rm -} +{\rm +} TU -\\ - +\\ FIGURE -^\begin{figure}\[${LOC}\]^ -^\end{figure}^ +^\begin{figure}\[${LOC}\]^ +^\end{figure}^ EPS -^\centerline{\epsffile{${FILE}}}^ - +^\centerline{\epsffile{${FILE}}}^ PH -^\vspace{${VSPACE}}\par^ - +^\vspace{${VSPACE}}\par^ CAPTION -^\caption{ -}^ +^\caption{ +}^ TABLE -^\begin{table}\[${LOC}\]^ -^\end{table}^ +^\begin{table}\[${LOC}\]^ +^\end{table}^ @@ -930,33 +892,30 @@ TABULAR ^\begin{center} -\begin{tabular}{${CA}}^ +\begin{tabular}{${CA}}^ ^\end{tabular} -\end{center}^ +\end{center}^ ROWSEP -\\ ^ - +\\ ^ COLSEP -& - +& HLINE -^\hline^ - +^\hline^ @@ -972,16 +931,15 @@ \end{center} \bigskip } -\begin{document}^ -^\end{document}^ +\begin{document}^ +^\end{document}^ SLIDE - -^\newpage^ +^\newpage^ diff --git a/share/sgml/transpec/linuxdoc-roff.ts b/share/sgml/transpec/linuxdoc-roff.ts index aa31ae6ff8c8..d253b94afcb1 100644 --- a/share/sgml/transpec/linuxdoc-roff.ts +++ b/share/sgml/transpec/linuxdoc-roff.ts @@ -1,6 +1,6 @@ - -&cmap; - - - - -&sdata; - + +&cmap; +&sdata; @@ -129,9 +123,8 @@ ${_followrel descendant LABEL &r.initr;} ARTICLE - -^.nr Hb 4 -.nr Hs 4^ +^.nr Hb 4 +.nr Hs 4^ ^.bp .TC^ @@ -145,7 +138,7 @@ ${_followrel descendant LABEL &r.initr;} .nr Hs 5^ ^.bp -.TC^ +.TC^ @@ -162,29 +155,25 @@ ${_followrel descendant LABEL &r.initr;} TITLEPAG - -^\& -.if t .SP 1i^ - -^.SP 3^ +^\& +.if t .SP 1i^ +^.SP 3^ TITLE - -^.if t .S 18 +^.if t .S 18 .DS C F .if t .fam H .B -.if t .SA 0^ - -^.if t .SA 1 +.if t .SA 0^ +^.if t .SA 1 .R .if t .fam &family; .DE -.if t .S D^ +.if t .S D^ @@ -196,30 +185,28 @@ ${_followrel descendant LABEL &r.initr;} DATE -^.DS C F^ -^.DE^ +^.DS C F^ +^.DE^ ABSTRACT - -^.SP 3 +^.SP 3 .DS C .B Abstract .DE -.DS I F^ - -^.DE^ +.DS I F^ +^.DE^ AUTHOR -^.DS C F^ -^.DE^ +^.DS C F^ +^.DE^ @@ -231,38 +218,37 @@ ${_followrel descendant LABEL &r.initr;} AND -^.br^ +^.br^ THANKS - -\*F -.FS^ - ^.FE^ +\*F +.FS^ +^.FE^ INST - ^.br^ +^.br^ NEWLINE - ^.br^ +^.br^ LABEL -^.SETR "${ID}"^ +^.SETR "${ID}"^ @@ -274,31 +260,31 @@ ${_followrel descendant LABEL &r.initr;} LHEAD - ^.EH ' - '''^ +^.EH ' +'''^ RHEAD - ^.OH ''' - '^ +^.OH ''' +'^ COMMENT - ^(*^ - ^*)^ +^(*^ +^*)^ APPENDIX - ^.af H1 A^ +^.af H1 A^ @@ -325,8 +311,7 @@ ${_followrel descendant LABEL &r.initr;} CHAPT - -^.if t .SK +^.if t .SK ${_set sl 1} @@ -372,7 +357,7 @@ ${_set sl 1} SECT2 -${_set sl 3} +${_set sl 3} @@ -410,18 +395,17 @@ ${_set sl 1} HEADING PART - -^.if t .SK +^.if t .SK \& .if t .fam H .SP 3i .if t .S 24 Part \n+(H0 .SP 1i -.if t .S 36^ +.if t .S 36^ ^.if t .S D .if t .fam &family; -.if t .SK^ +.if t .SK^ @@ -430,7 +414,7 @@ Part \n+(H0 ^.H ${sl} " " -${_followrel child LABEL &r.label} +${_followrel child LABEL &r.label} @@ -459,7 +443,7 @@ ${_followrel child LABEL &r.label} P - ${_notempty &r.phack;} +${_notempty &r.phack;} @@ -467,7 +451,7 @@ ${_followrel child LABEL &r.label} _phack -^.P^ +^.P^ @@ -475,145 +459,142 @@ ${_followrel child LABEL &r.label} ITEMIZE - ^.BL^ - ^.LE^ +^.BL^ +^.LE^ ENUM - ^.AL^ - ^.LE^ +^.AL^ +^.LE^ DESCRIP - ^.BVL \n(Li*2/1 \n(Li^ - ^.LE^ +^.BVL \n(Li*2/1 \n(Li^ +^.LE^ ITEM - ^.LI^ +^.LI^ TAG - ^.LI " -"^ +^.LI " +"^ CITE - ^.\[ +^.\[ ${ID} -.\]^ +.\]^ NCITE - ^.\[ +^.\[ ${ID} .\] -(${NOTE}) +(${NOTE}) FOOTNOTE - -\*F -.FS^ -^.FE^ +\*F +.FS^ +^.FE^ SQ - \*Q - \*U +\*Q +\*U LQ - -^.if t .br +^.if t .br .if t .S -2 -.DS I F^ - -^.DE -.if t .S D^ +.DS I F^ +^.DE +.if t .S D^ EM - \fI - \fR +\fI +\fR BF - \fB - \fR +\fB +\fR IT - \fI - \fR +\fI +\fR SF - \fR - \fR +\fR +\fR SL - \fI - \fR +\fI +\fR TT - \fC - \fR +\fC +\fR CPARAM - \fI< - >\fR +\fI< +>\fR @@ -622,11 +603,11 @@ ${ID} URL NAME . - ${NAME}\*F +${NAME}\*F .FS \fC<URL:${URL}>\fP .FE -\& +\& @@ -634,14 +615,14 @@ ${ID} URL - \fC<URL:${URL}>\fP +\fC<URL:${URL}>\fP HTMLURL - ${NAME} +${NAME} @@ -649,33 +630,30 @@ ${ID} REF NAME . - -\fI${NAME}\fP (section\~ +\fI${NAME}\fP (section\~ .GETHN "${ID}" , page\~ .GETPN "${ID}" -) +) REF - -\fI${ID}\fP (section\~ +\fI${ID}\fP (section\~ .GETHN "${ID}" , page\~ .GETPN "${ID}" -) +) PAGEREF - -^.GETPN "${ID}" -\& +^.GETPN "${ID}" +\& @@ -692,22 +670,21 @@ ${ID} BIBLIO - ^.\[ +^.\[ \$LIST\$ -.\]^ +.\]^ VERB CODE - ^.if t .br +^.if t .br .if t .S -2 .DS I -.fam C^ - -^.DE -.if t .S D^ +.fam C^ +^.DE +.if t .S D^ @@ -720,98 +697,96 @@ ${ID} TSCREEN - ^.if t .br +^.if t .br .if t .S -2 .DS I -.fam C^ - -^.DE -.if t .S D^ +.fam C^ +^.DE +.if t .S D^ QUOTE - ^.DS I F^ - -^.DE^ +^.DS I F^ +^.DE^ DEF - ^.sp +^.sp .nr def \n\[def\]+1 -.B "Definition \n\[def\] "^ - ^.ft P -.sp^ +.B "Definition \n\[def\] "^ +^.ft P +.sp^ PROP - ^.sp +^.sp .nr prop \n\[prop\]+1 -.B "Proposition \n\[prop\] "^ - ^.ft P -.sp^ +.B "Proposition \n\[prop\] "^ +^.ft P +.sp^ LEMMA - ^.sp +^.sp .nr lemma \n\[lemma\]+1 -.B "Lemma \n\[lemma\] "^ - ^.ft P -.sp^ +.B "Lemma \n\[lemma\] "^ +^.ft P +.sp^ COROLL - ^.sp +^.sp .nr coroll \n\[coroll\]+1 -.B "Corolloary \n\[coroll\] "^ - ^.ft P -.sp^ +.B "Corolloary \n\[coroll\] "^ +^.ft P +.sp^ PROOF - ^.sp +^.sp .nr proof \n\[proof\]+1 -.B "Proof \n\[proof\] "^ - ^.ft P -.sp^ +.B "Proof \n\[proof\] "^ +^.ft P +.sp^ THEOREM - ^.sp +^.sp .nr theorem \n\[theorem\]+1 -.B "Theorem \n\[theorem\] "^ - ^.ft P -.sp^ +.B "Theorem \n\[theorem\] "^ +^.ft P +.sp^ THTAG - ^.B -( - ) -.I^ +^.B +( +) +.I^ @@ -823,16 +798,16 @@ ${ID} DM - ^.DS L^ - ^.DE^ +^.DS L^ +^.DE^ EQ - ^.DS L^ - ^.DE^ +^.DS L^ +^.DE^ @@ -844,16 +819,16 @@ ${ID} NU - { - } over +{ +} over DE - { - } +{ +} @@ -870,16 +845,16 @@ ${ID} LL - from { - } +from { +} UL - to { - } +to { +} @@ -891,39 +866,39 @@ ${ID} PR - prod + prod IN - int + int SUM - sum + sum ROOT - sqrt { - } + sqrt { +} AR - ^.TS +^.TS center, tab(|) ; -${CA}.^ - ^.TE^ +${CA}.^ +^.TE^ @@ -935,78 +910,78 @@ ${CA}.^ ARC - | +| SUP - sup { - } + sup { +} INF - sub { - } + sub { +} UNL - { - } under +{ +} under OVL - { - } bar +{ +} bar RF - bold{ - } + bold{ +} V - { - } vec +{ +} vec FI - \fI - \fR +\fI +\fR PHR - roman } - } + roman } +} TU - ^.br^ +^.br^ @@ -1018,176 +993,175 @@ ${CA}.^ EPS - ^.if t .PSPIC ${FILE} -.if n .sp 4^ +^.if t .PSPIC ${FILE} +.if n .sp 4^ PH - ^.sp ${VSPACE}^ +^.sp ${VSPACE}^ CAPTION - ^.sp -.ce^ +^.sp +.ce^ TABLE - ^.DF -.R^ - ^.DE^ +^.DF +.R^ +^.DE^ TABULAR - ^.TS +^.TS center, tab(|) ; -${CA}.^ - ^.TE^ +${CA}.^ +^.TE^ ROWSEP - -^ +^ COLSEP - | +| HLINE - ^_^ +^_^ SLIDES - ^.nr PS 18^ +^.nr PS 18^ SLIDE - ^.bp -\&^ +^.bp +\&^ LETTER - ^.nf^ - ^ +^.nf^ +^ FROM - ^From: +^From: TO - ^To: +^To: ADDRESS - ^.de Ad - ^..^ +^.de Ad +^..^ EMAIL - < - > +< +> SUBJECT - ^Subject: +^Subject: SREF - ^Sref: +^Sref: RREF - ^In-Reply-To: +^In-Reply-To: CC - ^cc: +^cc: OPENING - ^.fi -.LP^ +^.fi +.LP^ CLOSING - ^.LP^ +^.LP^ ENCL - ^.XP -encl: +^.XP +encl: PS - ^.LP -p.s. +^.LP +p.s. diff --git a/share/sgml/transpec/transpec.dtd b/share/sgml/transpec/transpec.dtd index bcb1e501e394..69075de689d4 100644 --- a/share/sgml/transpec/transpec.dtd +++ b/share/sgml/transpec/transpec.dtd @@ -1,6 +1,6 @@