Converted html tags to lower case (part of feature request #5879)

git-svn-id: svn://scm.r-forge.r-project.org/svnroot/xtable@45 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 88f6e2306c644399a35dd2092d2909f3bc780284..d2884beb94b4c543df4c068aae21d21a64ff60de 100644 (file)
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: xtable
-Version: 1.7-3
-Date: 2014/01/08
+Version: 1.7-4
+Date: 2014/08/17
 Title: Export tables to LaTeX or HTML
 Author: David B. Dahl <dahl@stat.tamu.edu>
-Maintainer: Charles Roosen <statsci@gmail.com>
+Maintainer: David Scott <d.scott@auckland.ac.nz>
 Description: Coerce data to LaTeX and HTML tables
 URL: http://xtable.r-forge.r-project.org/
 Depends: R (>= 2.10.0)

diff --git a/pkg/NEWS b/pkg/NEWS
index c89cf1cac330719bd965cc25a732cd24e8b7eca1..ec4aebe5a598211e14c53e1399f892b308d6189d 100644 (file)
--- a/pkg/NEWS
+++ b/pkg/NEWS
@@ -1,8 +1,12 @@
-1.7-3 (2014-01-08)
+
+1.7-4 (NOT YET RELEASED)
+  * Changed tags in HTML to be all lower case, to be compatible with
+    HTML5, part of feature request(#5879)
   * Fixed booktabs bug (#2309), more of an enhancement really. Updated
     xtableGallery.snw to illustrate the change.
   * Moved vignettes from inst/doc to vignettes as now required by CRAN
 
+
 1.7-2 (2013-08-28, Not Released to CRAN)
   * Fixed HTML gsub bug (#2795)
   * Dealt with format.args bug (#4770). No code changes, but the

diff --git a/pkg/R/print.xtable.R b/pkg/R/print.xtable.R
index 34b0a7c43facb9f0089f189321a15b75a807b596..8aec031e4fd74314dd17bfc3a91af32997c06184 100644 (file)
--- a/pkg/R/print.xtable.R
+++ b/pkg/R/print.xtable.R
@@ -4,7 +4,7 @@
 ###\r
 ### Copyright 2000-2013 David B. Dahl <dahl@stat.tamu.edu>\r
 ###\r
-### Maintained by Charles Roosen <croosen@mango-solutions.com>\r
+### Maintained by David Scott <d.scott@auckland.ac.nz>\r
 ###\r
 ### This file is part of the `xtable' library for R and related languages.\r
 ### It is made available under the terms of the GNU General Public\r
@@ -403,25 +403,25 @@ print.xtable <- function(x,
     } else {\r
         BCOMMENT <- "<!-- "\r
         ECOMMENT <- " -->\n"\r
-        BTABLE <- paste("<TABLE ", html.table.attributes, ">\n", sep = "")\r
-        ETABLE <- "</TABLE>\n"\r
+        BTABLE <- paste("<table ", html.table.attributes, ">\n", sep = "")\r
+        ETABLE <- "</table>\n"\r
         BENVIRONMENT <- ""\r
         EENVIRONMENT <- ""\r
         BTABULAR <- ""\r
         ETABULAR <- ""\r
         BSIZE <- ""\r
         ESIZE <- ""\r
-        BLABEL <- "<A NAME="\r
-        ELABEL <- "></A>\n"\r
-        BCAPTION <- paste("<CAPTION ALIGN=\"", caption.placement, "\"> ",\r
+        BLABEL <- "<a name="\r
+        ELABEL <- "></a>\n"\r
+        BCAPTION <- paste("<caption align=\"", caption.placement, "\"> ",\r
                           sep = "")\r
-        ECAPTION <- " </CAPTION>\n"\r
-        BROW <- "<TR>"\r
-        EROW <- " </TR>\n"\r
-        BTH <- " <TH> "\r
-        ETH <- " </TH> "\r
-        STH <- " </TH> <TH> "\r
-        BTD1 <- " <TD align=\""\r
+        ECAPTION <- " </caption>\n"\r
+        BROW <- "<tr>"\r
+        EROW <- " </tr>\n"\r
+        BTH <- " <th> "\r
+        ETH <- " </th> "\r
+        STH <- " </th> <th> "\r
+        BTD1 <- " <td align=\""\r
         align.tmp <- attr(x, "align", exact = TRUE)\r
         align.tmp <- align.tmp[align.tmp!="|"]\r
         BTD2 <- matrix(align.tmp[(2-pos):(ncol(x)+1)],\r
@@ -433,7 +433,7 @@ print.xtable <- function(x,
         BTD2[BTD2 == "l"] <- "left"\r
         BTD2[BTD2 == "c"] <- "center"\r
         BTD3 <- "\"> "\r
-        ETD  <- " </TD>"\r
+        ETD  <- " </td>"\r
         sanitize <- function(str) {\r
             result <- str\r
             ## Changed as suggested in bug report #2795\r