auriemma 00/12/14 07:41:51
Modified: c/src/XMLSupport FormatterToHTML.cpp FormatterToHTML.hpp
Log:
Added meta tag to html head output.
Revision Changes Path
1.38 +23 -2 xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- FormatterToHTML.cpp 2000/12/12 16:34:10 1.37
+++ FormatterToHTML.cpp 2000/12/14 15:41:43 1.38
@@ -393,6 +393,7 @@
getElemDesc(name);
bool isBlockElement = elemDesc.is(ElemDesc::BLOCK);
+ bool isHeadElement = elemDesc.is(ElemDesc.HEADELEM);
m_isScriptOrStyleElem =
equalsIgnoreCaseASCII(name, c_wstr(s_scriptString)) ||
@@ -434,6 +435,19 @@
m_isprevtext = false;
m_isFirstElem = false;
+
+ if (isHeadElement)
+ {
+ writeParentTagEnd();
+
+ if (m_doIndent)
+ indent(m_currentIndent);
+
+ accumContent(s_metaString);
+ accumContent(getEncoding());
+ accumContent(XalanUnicode::charQuoteMark);
+ accumContent(XalanUnicode::charGreaterThanSign);
+ }
}
@@ -1453,7 +1467,7 @@
theElementFlags.insert(
ElementFlagsMapType::value_type(
c_wstr(XALAN_STATIC_UCODE_STRING("HEAD")),
- ElemDesc(0|ElemDesc::BLOCK)));
+ ElemDesc(0|ElemDesc::BLOCK|ElemDesc::HEADELEM)));
(*theResult.first).second.setAttr(c_wstr(XALAN_STATIC_UCODE_STRING("PROFILE")),
ElemDesc::ATTRURL);
@@ -1556,6 +1570,8 @@
static XalanDOMCharVectorType s_oeligString;
+static XalanDOMCharVectorType s_metaString;
+
const XalanDOMCharVectorType&
FormatterToHTML::s_doctypeHeaderStartString =
::s_doctypeHeaderStartString;
@@ -1586,8 +1602,9 @@
const XalanDOMCharVectorType& FormatterToHTML::s_oeligString =
::s_oeligString;
-
+const XalanDOMCharVectorType& FormatterToHTML::s_metaString =
+ ::s_metaString;
#if !defined(XALAN_LSTRSUPPORT)
void
@@ -1631,6 +1648,8 @@
::s_fnofString =
MakeXalanDOMCharVector(c_wstr(XALAN_STATIC_UCODE_STRING("fnof")));
::s_oeligString =
MakeXalanDOMCharVector(c_wstr(XALAN_STATIC_UCODE_STRING("OElig")));
+
+ ::s_metaString =
MakeXalanDOMCharVector(c_wstr(XALAN_STATIC_UCODE_STRING("<META
http-equiv=\"Content-Type\" content=\"text/html; charset=")));
#if !defined(XALAN_LSTRSUPPORT)
pushStringsOnVector(
@@ -1676,6 +1695,8 @@
XalanDOMCharVectorType().swap(::s_fnofString);
XalanDOMCharVectorType().swap(::s_oeligString);
+
+ XalanDOMCharVectorType().swap(::s_metaString);
#if !defined(XALAN_LSTRSUPPORT)
XalanDOMStringVectorType().swap(theHTMLSymbols1);
1.17 +6 -0 xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp
Index: FormatterToHTML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FormatterToHTML.hpp 2000/12/12 16:34:10 1.16
+++ FormatterToHTML.hpp 2000/12/14 15:41:44 1.17
@@ -58,7 +58,7 @@
#define FORMATTERTOHTML_HEADER_GUARD_1357924680
/**
- * $Id: FormatterToHTML.hpp,v 1.16 2000/12/12 16:34:10 dbertoni Exp $
+ * $Id: FormatterToHTML.hpp,v 1.17 2000/12/14 15:41:44 auriemma Exp $
*
* $State: Exp $
*
@@ -203,6 +203,7 @@
LIST = (1 << 19),
PREFORMATTED = (1 << 20),
WHITESPACESENSITIVE = (1 << 21),
+ HEADELEM = (1 << 22),
ATTRURL = (1 << 1),
ATTREMPTY = (1 << 2)
@@ -352,6 +353,11 @@
* The string "OElig".
*/
static const XalanDOMCharVectorType& s_oeligString;
+
+ /**
+ * The string "<META http-equiv=\"Content-Type\" content=\"text/html;
charset=".
+ */
+ static const XalanDOMCharVectorType& s_metaString;
/**
* Set the attribute characters what will require special mapping.
