Bug fixes. Added an <htmlurl> tag to be compatible with the latest

linuxdoc.
Obtained from:	Linuxdoc 1.3

7 files changed, 32 insertions, 13 deletions

diff --git a/share/sgml/FreeBSD/dtd/linuxdoc b/share/sgml/FreeBSD/dtd/linuxdoc
index 775d984..b0b7fb0 100644
--- a/share/sgml/FreeBSD/dtd/linuxdoc
+++ b/share/sgml/FreeBSD/dtd/linuxdoc
@@ -6,9 +6,9 @@
 
 <!entity % index "idx|cdx" >
 
-<!-- url added by HG -->
+<!-- url added by HG; htmlurl added by esr -->
 <!entity % xref
-	" label|ref|pageref|cite|url|ncite " >
+	" label|ref|pageref|cite|url|htmlurl|ncite|email " >
 
 <!entity % inline 
 	" (#pcdata | f| x| %emph; |sq| %xref | %index )* " >
@@ -368,6 +368,12 @@
         url cdata #required
         name cdata "&urlnam" >
 
+<!-- htmlurl entity added to have quieter url references esr -->
+<!element htmlurl - o empty>
+<!attlist htmlurl   
+        url cdata #required
+        name cdata "&urlnam" >
+
 <!element pageref - o empty>
 <!attlist pageref
         id cdata #required>
diff --git a/share/sgml/FreeBSD/rep/html.general b/share/sgml/FreeBSD/rep/html.general
index 7aa9ecf..c82b6ad 100644
--- a/share/sgml/FreeBSD/rep/html.general
+++ b/share/sgml/FreeBSD/rep/html.general
@@ -49,11 +49,11 @@
 <!entity lt sdata "&lt;" >
 <!entity amp sdata "&amp;" >
 <!entity ero sdata "&amp;" >
-<!entity etago sdata "</" >
-<!entity dquot sdata '"' >
+<!entity etago sdata "&lt;/" >
+<!entity dquot sdata "&quot;" >
 <!entity num sdata "#" >
 <!entity percnt sdata "%" >
-<!entity quot sdata "&quot;" >
+<!entity quot sdata "'" >
 <!entity lpar sdata "&lpar;" >
 <!entity rpar sdata "&rpar;" >
 <!entity ast sdata "&ast;" >
diff --git a/share/sgml/FreeBSD/rep/html.mapping b/share/sgml/FreeBSD/rep/html.mapping
index dd53e90..22d5826 100644
--- a/share/sgml/FreeBSD/rep/html.mapping
+++ b/share/sgml/FreeBSD/rep/html.mapping
@@ -163,6 +163,11 @@
 			"<@@endurl>"		+
 </url>
 
+<htmlurl>	+	"<@@url>[URL]\n"
+			"[NAME]</a>\n"
+			"<@@endurl>"		+
+</htmlurl>
+
 % ref modified to have an optional name field 
 <ref>		+	"<@@ref>[ID]\n"
 			"[NAME]</A>\n"
@@ -368,8 +373,8 @@
 <address>	+	"<ADDRESS>"	+
 </address>	+	"</ADDRESS>"	+
 
-<email>		+	"<EMAIL>"
-</email>		"</EMAIL>"	+
+<email>		+	"<@@email>"
+</email>		"<@@endemail>"	+
 
 <phone>		+	"<PHONE>"	
 </phone>		"</PHONE>"	+
diff --git a/share/sgml/FreeBSD/rep/latex.general b/share/sgml/FreeBSD/rep/latex.general
index cd57f2a..7b778bc 100644
--- a/share/sgml/FreeBSD/rep/latex.general
+++ b/share/sgml/FreeBSD/rep/latex.general
@@ -3,6 +3,7 @@
 <!entity Aacute sdata "\'{A}" >
 <!entity Acirc sdata "\^{A}" >
 <!entity Agrave sdata "\`{A}" >
+<!entity Aring sdata "{\AA}" >
 <!entity Atilde sdata "\~{A}" >
 <!entity Ccedil sdata "\c{C}" >
 <!entity Eacute sdata "\'{E}" >
@@ -48,8 +49,8 @@
 <!entity yuml sdata '\"{y}' >
 <!entity lt sdata "{$<$}" >
 <!entity amp sdata "\&" >
-<!entity ero sdata "&" >
-<!entity etago sdata "</" >
+<!entity ero sdata "\&" >
+<!entity etago sdata "{$<$}/" >
 <!entity dquot sdata '{\tt "}' >
 <!entity num sdata "\#" >
 <!entity percnt sdata "\%" >
diff --git a/share/sgml/FreeBSD/rep/latex.mapping b/share/sgml/FreeBSD/rep/latex.mapping
index 1841454..9f6fa04 100644
--- a/share/sgml/FreeBSD/rep/latex.mapping
+++ b/share/sgml/FreeBSD/rep/latex.mapping
@@ -208,6 +208,9 @@
 <url>			"\\url{[URL]}{[NAME]}"
 </url>
 
+<htmlurl>		"[NAME]"
+</htmlurl>
+
 <x>	
 </x>
 
diff --git a/share/sgml/FreeBSD/rep/nroff.general b/share/sgml/FreeBSD/rep/nroff.general
index 213f1ff..4913ca1 100644
--- a/share/sgml/FreeBSD/rep/nroff.general
+++ b/share/sgml/FreeBSD/rep/nroff.general
@@ -8,6 +8,7 @@ symbol or character, I just used its SGML representation. -->
 <!entity Aacute sdata "A" >
 <!entity Acirc sdata "A" >
 <!entity Agrave sdata "A" >
+<!entity Aring sdata "AA" >
 <!entity Atilde sdata "A" >
 <!entity Ccedil sdata "C" >
 <!entity Eacute sdata "E" >
@@ -21,7 +22,7 @@ symbol or character, I just used its SGML representation. -->
 <!entity Oacute sdata "O" >
 <!entity Ocirc sdata "O" >
 <!entity Ograve sdata "O" >
-<!entity Oslash sdata "O" >
+<!entity Oslash sdata "OE" >
 <!entity Uacute sdata "U" >
 <!entity Ugrave sdata "U" >
 <!entity Yacute sdata "Y" >
@@ -29,7 +30,7 @@ symbol or character, I just used its SGML representation. -->
 <!entity acirc sdata "a" >
 <!entity aelig sdata "ae" >
 <!entity agrave sdata "a" >
-<!entity aring sdata "a" >
+<!entity aring sdata "aa" >
 <!entity atilde sdata "a" >
 <!entity ccedil sdata "c" >
 <!entity eacute sdata "e" >
@@ -44,7 +45,7 @@ symbol or character, I just used its SGML representation. -->
 <!entity oacute sdata "o" >
 <!entity ocirc sdata "o" >
 <!entity ograve sdata "o" >
-<!entity oslash sdata "o" >
+<!entity oslash sdata "oe" >
 <!entity otilde sdata "o" >
 <!entity uacute sdata "u" >
 <!entity ucirc sdata "u" >
diff --git a/share/sgml/FreeBSD/rep/nroff.mapping b/share/sgml/FreeBSD/rep/nroff.mapping
index 98cbced..14128f2 100644
--- a/share/sgml/FreeBSD/rep/nroff.mapping
+++ b/share/sgml/FreeBSD/rep/nroff.mapping
@@ -366,9 +366,12 @@
 <cparam>		"\\fI<"
 </cparam>		">\\fR"
 
-<url>			"[NAME] (\\fC[URL]\\fR)"
+<url>			"[NAME] <\\fC[URL]\\fR>"
 </url>
 
+<htmlurl>		"[NAME]"
+</htmlurl>
+
 <ref>			"``[NAME]''"
 </ref>