You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/03/27 22:35:03 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xpath/xml FormatterToHTML.java
mmidy 00/03/27 12:35:02
Modified: src/org/apache/xalan/xpath/xml FormatterToHTML.java
Log:
Fix some HTML entities
Revision Changes Path
1.31 +30 -4 xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java
Index: FormatterToHTML.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FormatterToHTML.java 2000/03/16 17:33:36 1.30
+++ FormatterToHTML.java 2000/03/27 20:34:58 1.31
@@ -109,7 +109,7 @@
"Gamma", "Delta", "Epsilon", "Zeta",
"Eta", "Theta", "Iota", "Kappa",
"Lambda", "Mu", "Nu", "Xi",
- "Omicron", "Pi", "Rho", "Sigma",
+ "Omicron", "Pi", "Rho", "", "Sigma",
"Tau", "Upsilon", "Phi", "Chi",
"Psi", "Omega"};
@@ -724,7 +724,7 @@
accum(s_HTMLlat1[((int)ch)-160]);
accum(';');
}
- else if((ch >= 913) && (ch <= 937))
+ else if((ch >= 913) && (ch <= 937) && (ch != 930))
{
accum('&');
accum(HTMLsymbol1[((int)ch)-913]);
@@ -736,6 +736,20 @@
accum(HTMLsymbol2[((int)ch)-945]);
accum(';');
}
+ else if((ch >= 977) && (ch <= 978))
+ {
+ accum('&');
+ // substracting the number of unused characters
+ accum(HTMLsymbol2[((int)ch)-945 - 7]);
+ accum(';');
+ }
+ else if((ch == 982))
+ {
+ accum('&');
+ // substracting the number of unused characters
+ accum(HTMLsymbol2[((int)ch)-945 - 10]);
+ accum(';');
+ }
else if (402 == ch)
{
accum("ƒ");
@@ -830,10 +844,11 @@
m_ispreserve = true;
int pos = 0;
int end = start+length;
+
for (int i = start; i < end; i ++)
{
char ch = chars[i];
-
+
if((ch < SPECIALSSIZE) && (m_charsMap[ch] != 'S'))
{
accum(ch);
@@ -878,7 +893,7 @@
{
pos = copyEntityIntoBuf(s_HTMLlat1[((int)ch)-160], pos);
}
- else if((ch >= 913) && (ch <= 937))
+ else if((ch >= 913) && (ch <= 937) && (ch != 930))
{
pos = copyEntityIntoBuf(HTMLsymbol1[((int)ch)-913], pos);
}
@@ -886,6 +901,16 @@
{
pos = copyEntityIntoBuf(HTMLsymbol2[((int)ch)-945], pos);
}
+ else if((ch >= 977) && (ch <= 978))
+ {
+ // subtract the unused characters
+ pos = copyEntityIntoBuf(HTMLsymbol2[((int)ch)-945 -7], pos);
+ }
+ else if((ch == 982))
+ {
+ // subtract the unused characters
+ pos = copyEntityIntoBuf(HTMLsymbol2[((int)ch)-945 -10], pos);
+ }
else if (402 == ch)
{
pos = copyEntityIntoBuf("fnof", pos);
@@ -935,6 +960,7 @@
accum(';');
}
}
+
m_isprevtext = true;
}