Browse Source

Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0

release/10.0
Hugh.C 5 years ago
parent
commit
d44872dca6
  1. 14
      fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfGraphics2D.java
  2. 307
      fine-itext/src/com/fr/third/v2/lowagie/text/html/WebColors.java
  3. 9
      fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java
  4. 30
      fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java
  5. 1
      fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

14
fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfGraphics2D.java

@ -382,7 +382,10 @@ public class PdfGraphics2D extends Graphics2D {
// value. When they are the same value then we are normally dealing // value. When they are the same value then we are normally dealing
// with a single font that has been made into an italic or bold // with a single font that has been made into an italic or bold
// font. // font.
if (font.isItalic() && font.getFontName().equals(font.getName())) { if (font.isItalic())
//awt.font只要样式,不验证是否安装,真实绘制的字体是 baseFont
// && font.getFontName().equals(font.getName()))
{
float angle = baseFont.getFontDescriptor(BaseFont.ITALICANGLE, 1000); float angle = baseFont.getFontDescriptor(BaseFont.ITALICANGLE, 1000);
float angle2 = font.getItalicAngle(); float angle2 = font.getItalicAngle();
// We don't have an italic version of this font so we need // We don't have an italic version of this font so we need
@ -419,10 +422,13 @@ public class PdfGraphics2D extends Graphics2D {
weight = (font.isBold()) ? TextAttribute.WEIGHT_BOLD weight = (font.isBold()) ? TextAttribute.WEIGHT_BOLD
: TextAttribute.WEIGHT_REGULAR; : TextAttribute.WEIGHT_REGULAR;
} }
if ((font.isBold() || (weight.floatValue() >= TextAttribute.WEIGHT_SEMIBOLD.floatValue())) if ((font.isBold() || (weight.floatValue() >= TextAttribute.WEIGHT_SEMIBOLD.floatValue())))
&& (font.getFontName().equals(font.getName()))) { //awt.font只要样式,不验证是否安装,真实绘制的字体是 baseFont
// && (font.getFontName().equals(font.getName())))
{
// Simulate a bold font. // Simulate a bold font.
float strokeWidth = font.getSize2D() * (weight.floatValue() - TextAttribute.WEIGHT_REGULAR.floatValue()) / 30f; // 30有点粗 ,换成40
float strokeWidth = font.getSize2D() * (weight.floatValue() - TextAttribute.WEIGHT_REGULAR.floatValue()) / 40f;
if (strokeWidth != 1) { if (strokeWidth != 1) {
if(realPaint instanceof Color){ if(realPaint instanceof Color){
cb.setTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE); cb.setTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL_STROKE);

307
fine-itext/src/com/fr/third/v2/lowagie/text/html/WebColors.java

@ -66,147 +66,170 @@ public class WebColors extends HashMap {
/** HashMap containing all the names and corresponding color values. */ /** HashMap containing all the names and corresponding color values. */
public static final WebColors NAMES = new WebColors(); public static final WebColors NAMES = new WebColors();
static { static {
NAMES.put("aliceblue", new int[] { 0xf0, 0xf8, 0xff, 0x00 }); //比对 https://html-color-codes.info/color-names/
NAMES.put("antiquewhite", new int[] { 0xfa, 0xeb, 0xd7, 0x00 }); //Red color names
NAMES.put("aqua", new int[] { 0x00, 0xff, 0xff, 0x00 }); NAMES.put("indianred", new int[]{0xcd, 0x5c, 0x5c, 0xff});
NAMES.put("aquamarine", new int[] { 0x7f, 0xff, 0xd4, 0x00 }); NAMES.put("lightcoral", new int[]{0xf0, 0x80, 0x80, 0xff});
NAMES.put("azure", new int[] { 0xf0, 0xff, 0xff, 0x00 }); NAMES.put("salmon", new int[]{0xfa, 0x80, 0x72, 0xff});
NAMES.put("beige", new int[] { 0xf5, 0xf5, 0xdc, 0x00 }); NAMES.put("darksalmon", new int[]{0xe9, 0x96, 0x7a, 0xff});
NAMES.put("bisque", new int[] { 0xff, 0xe4, 0xc4, 0x00 }); NAMES.put("lightsalmon", new int[]{0xff, 0xa0, 0x7a, 0xff});
NAMES.put("black", new int[] { 0x00, 0x00, 0x00, 0x00 }); NAMES.put("crimson", new int[]{0xdc, 0x14, 0x3c, 0xff});
NAMES.put("blanchedalmond", new int[] { 0xff, 0xeb, 0xcd, 0x00 }); NAMES.put("firebrick", new int[]{0xb2, 0x22, 0x22, 0xff});
NAMES.put("blue", new int[] { 0x00, 0x00, 0xff, 0x00 }); NAMES.put("darkred", new int[]{0x8b, 0x00, 0x00, 0xff});
NAMES.put("blueviolet", new int[] { 0x8a, 0x2b, 0xe2, 0x00 }); NAMES.put("red", new int[]{0xff, 0x00, 0x00, 0xff});
NAMES.put("brown", new int[] { 0xa5, 0x2a, 0x2a, 0x00 });
NAMES.put("burlywood", new int[] { 0xde, 0xb8, 0x87, 0x00 }); //Pink color names
NAMES.put("cadetblue", new int[] { 0x5f, 0x9e, 0xa0, 0x00 }); NAMES.put("pink", new int[]{0xff, 0xc0, 0xcb, 0xff});
NAMES.put("chartreuse", new int[] { 0x7f, 0xff, 0x00, 0x00 }); NAMES.put("lightpink", new int[]{0xff, 0xb6, 0xc1, 0xff});
NAMES.put("chocolate", new int[] { 0xd2, 0x69, 0x1e, 0x00 }); NAMES.put("hotpink", new int[]{0xff, 0x69, 0xb4, 0xff});
NAMES.put("coral", new int[] { 0xff, 0x7f, 0x50, 0x00 }); NAMES.put("deeppink", new int[]{0xff, 0x14, 0x93, 0xff});
NAMES.put("cornflowerblue", new int[] { 0x64, 0x95, 0xed, 0x00 }); NAMES.put("mediumvioletred", new int[]{0xc7, 0x15, 0x85, 0xff});
NAMES.put("cornsilk", new int[] { 0xff, 0xf8, 0xdc, 0x00 }); NAMES.put("palevioletred", new int[]{0xdb, 0x70, 0x93, 0xff});
NAMES.put("crimson", new int[] { 0xdc, 0x14, 0x3c, 0x00 });
NAMES.put("cyan", new int[] { 0x00, 0xff, 0xff, 0x00 }); //Orange color names
NAMES.put("darkblue", new int[] { 0x00, 0x00, 0x8b, 0x00 }); NAMES.put("coral", new int[]{0xff, 0x7f, 0x50, 0xff});
NAMES.put("darkcyan", new int[] { 0x00, 0x8b, 0x8b, 0x00 }); NAMES.put("tomato", new int[]{0xff, 0x63, 0x47, 0xff});
NAMES.put("darkgoldenrod", new int[] { 0xb8, 0x86, 0x0b, 0x00 }); NAMES.put("orangered", new int[]{0xff, 0x45, 0x00, 0xff});
NAMES.put("darkgray", new int[] { 0xa9, 0xa9, 0xa9, 0x00 }); NAMES.put("darkorange", new int[]{0xff, 0x8c, 0x00, 0xff});
NAMES.put("darkgreen", new int[] { 0x00, 0x64, 0x00, 0x00 }); NAMES.put("orange", new int[]{0xff, 0xa5, 0x00, 0xff});
NAMES.put("darkkhaki", new int[] { 0xbd, 0xb7, 0x6b, 0x00 });
NAMES.put("darkmagenta", new int[] { 0x8b, 0x00, 0x8b, 0x00 }); //Orange color names
NAMES.put("darkolivegreen", new int[] { 0x55, 0x6b, 0x2f, 0x00 }); NAMES.put("gold", new int[]{0xff, 0xd7, 0x00, 0xff});
NAMES.put("darkorange", new int[] { 0xff, 0x8c, 0x00, 0x00 }); NAMES.put("yellow", new int[]{0xff, 0xff, 0x00, 0xff});
NAMES.put("darkorchid", new int[] { 0x99, 0x32, 0xcc, 0x00 }); NAMES.put("lightyellow", new int[]{0xff, 0xff, 0xefe, 0xff});
NAMES.put("darkred", new int[] { 0x8b, 0x00, 0x00, 0x00 }); NAMES.put("lemonchiffon", new int[]{0xff, 0xfa, 0xcd, 0xff});
NAMES.put("darksalmon", new int[] { 0xe9, 0x96, 0x7a, 0x00 }); NAMES.put("lightgoldenrodyellow", new int[]{0xfa, 0xfa, 0xd2, 0xff});
NAMES.put("darkseagreen", new int[] { 0x8f, 0xbc, 0x8f, 0x00 }); NAMES.put("papayawhip", new int[]{0xff, 0xef, 0xd5, 0xff});
NAMES.put("darkslateblue", new int[] { 0x48, 0x3d, 0x8b, 0x00 }); NAMES.put("moccasin", new int[]{0xff, 0xe4, 0xb5, 0xff});
NAMES.put("darkslategray", new int[] { 0x2f, 0x4f, 0x4f, 0x00 }); NAMES.put("peachpuff", new int[]{0xff, 0xda, 0xb9, 0xff});
NAMES.put("darkturquoise", new int[] { 0x00, 0xce, 0xd1, 0x00 }); NAMES.put("palegoldenrod", new int[]{0xee, 0xe8, 0xaa, 0xff});
NAMES.put("darkviolet", new int[] { 0x94, 0x00, 0xd3, 0x00 }); NAMES.put("khaki", new int[]{0xf0, 0xe6, 0x8c, 0xff});
NAMES.put("deeppink", new int[] { 0xff, 0x14, 0x93, 0x00 }); NAMES.put("darkkhaki", new int[]{0xbd, 0xb7, 0x6b, 0xff});
NAMES.put("deepskyblue", new int[] { 0x00, 0xbf, 0xff, 0x00 });
NAMES.put("dimgray", new int[] { 0x69, 0x69, 0x69, 0x00 }); //Purple color names
NAMES.put("dodgerblue", new int[] { 0x1e, 0x90, 0xff, 0x00 }); NAMES.put("lavender", new int[]{0xe6, 0xe6, 0xfa, 0xff});
NAMES.put("firebrick", new int[] { 0xb2, 0x22, 0x22, 0x00 }); NAMES.put("thistle", new int[]{0xd8, 0xbf, 0xd8, 0xff});
NAMES.put("floralwhite", new int[] { 0xff, 0xfa, 0xf0, 0x00 }); NAMES.put("plum", new int[]{0xdd, 0xa0, 0xdd, 0xff});
NAMES.put("forestgreen", new int[] { 0x22, 0x8b, 0x22, 0x00 }); NAMES.put("violet", new int[]{0xee, 0x82, 0xee, 0xff});
NAMES.put("fuchsia", new int[] { 0xff, 0x00, 0xff, 0x00 }); NAMES.put("orchid", new int[]{0xda, 0x70, 0xd6, 0xff});
NAMES.put("gainsboro", new int[] { 0xdc, 0xdc, 0xdc, 0x00 }); NAMES.put("fuchsia", new int[]{0xff, 0x00, 0xff, 0xff});
NAMES.put("ghostwhite", new int[] { 0xf8, 0xf8, 0xff, 0x00 }); NAMES.put("magenta", new int[]{0xff, 0x00, 0xff, 0xff});
NAMES.put("gold", new int[] { 0xff, 0xd7, 0x00, 0x00 }); NAMES.put("mediumorchid", new int[]{0xba, 0x55, 0xd3, 0xff});
NAMES.put("goldenrod", new int[] { 0xda, 0xa5, 0x20, 0x00 }); NAMES.put("mediumpurple", new int[]{0x93, 0x70, 0xdb, 0xff});
NAMES.put("gray", new int[] { 0x80, 0x80, 0x80, 0x00 }); NAMES.put("amethyst", new int[]{0x99, 0x66, 0xcc, 0xff});
NAMES.put("green", new int[] { 0x00, 0x80, 0x00, 0x00 }); NAMES.put("blueviolet", new int[]{0x8a, 0x2b, 0xe2, 0xff});
NAMES.put("greenyellow", new int[] { 0xad, 0xff, 0x2f, 0x00 }); NAMES.put("darkviolet", new int[]{0x94, 0x00, 0xd3, 0xff});
NAMES.put("honeydew", new int[] { 0xf0, 0xff, 0xf0, 0x00 }); NAMES.put("darkorchid", new int[]{0x99, 0x32, 0xcc, 0xff});
NAMES.put("hotpink", new int[] { 0xff, 0x69, 0xb4, 0x00 }); NAMES.put("darkmagenta", new int[]{0x8b, 0x00, 0x8b, 0xff});
NAMES.put("indianred", new int[] { 0xcd, 0x5c, 0x5c, 0x00 }); NAMES.put("purple", new int[]{0x80, 0x00, 0x80, 0xff});
NAMES.put("indigo", new int[] { 0x4b, 0x00, 0x82, 0x00 }); NAMES.put("indigo", new int[]{0x4b, 0x00, 0x82, 0xff});
NAMES.put("ivory", new int[] { 0xff, 0xff, 0xf0, 0x00 }); NAMES.put("slateblue", new int[]{0x6a, 0x5a, 0xcd, 0xff});
NAMES.put("khaki", new int[] { 0xf0, 0xe6, 0x8c, 0x00 }); NAMES.put("darkslateblue", new int[]{0x48, 0x3d, 0x8b, 0xff});
NAMES.put("lavender", new int[] { 0xe6, 0xe6, 0xfa, 0x00 }); NAMES.put("mediumslateblue", new int[]{0x7b, 0x68, 0xee, 0xff});
NAMES.put("lavenderblush", new int[] { 0xff, 0xf0, 0xf5, 0x00 });
NAMES.put("lawngreen", new int[] { 0x7c, 0xfc, 0x00, 0x00 }); //Green color names
NAMES.put("lemonchiffon", new int[] { 0xff, 0xfa, 0xcd, 0x00 }); NAMES.put("greenyellow", new int[]{0xad, 0xff, 0x2f, 0xff});
NAMES.put("lightblue", new int[] { 0xad, 0xd8, 0xe6, 0x00 }); NAMES.put("chartreuse", new int[]{0x7f, 0xff, 0x00, 0xff});
NAMES.put("lightcoral", new int[] { 0xf0, 0x80, 0x80, 0x00 }); NAMES.put("lawngreen", new int[]{0x7c, 0xfc, 0x00, 0xff});
NAMES.put("lightcyan", new int[] { 0xe0, 0xff, 0xff, 0x00 }); NAMES.put("lime", new int[]{0x00, 0xff, 0x00, 0xff});
NAMES.put("lightgoldenrodyellow", new int[] { 0xfa, 0xfa, 0xd2, 0x00 }); NAMES.put("limegreen", new int[]{0x32, 0xcd, 0x32, 0xff});
NAMES.put("lightgreen", new int[] { 0x90, 0xee, 0x90, 0x00 }); NAMES.put("palegreen", new int[]{0x98, 0xfb, 0x98, 0xff});
NAMES.put("lightgrey", new int[] { 0xd3, 0xd3, 0xd3, 0x00 }); NAMES.put("lightgreen", new int[]{0x90, 0xee, 0x90, 0xff});
NAMES.put("lightpink", new int[] { 0xff, 0xb6, 0xc1, 0x00 }); NAMES.put("mediumspringgreen", new int[]{0x00, 0xfa, 0x9a, 0xff});
NAMES.put("lightsalmon", new int[] { 0xff, 0xa0, 0x7a, 0x00 }); NAMES.put("springgreen", new int[]{0x00, 0xff, 0x7f, 0xff});
NAMES.put("lightseagreen", new int[] { 0x20, 0xb2, 0xaa, 0x00 }); NAMES.put("mediumseagreen", new int[]{0x3c, 0xb3, 0x71, 0xff});
NAMES.put("lightskyblue", new int[] { 0x87, 0xce, 0xfa, 0x00 }); NAMES.put("seagreen", new int[]{0x2e, 0x8b, 0x57, 0xff});
NAMES.put("lightslategray", new int[] { 0x77, 0x88, 0x99, 0x00 }); NAMES.put("forestgreen", new int[]{0x22, 0x8b, 0x22, 0xff});
NAMES.put("lightsteelblue", new int[] { 0xb0, 0xc4, 0xde, 0x00 }); NAMES.put("green", new int[]{0x00, 0x80, 0x00, 0xff});
NAMES.put("lightyellow", new int[] { 0xff, 0xff, 0xe0, 0x00 }); NAMES.put("darkgreen", new int[]{0x00, 0x64, 0x00, 0xff});
NAMES.put("lime", new int[] { 0x00, 0xff, 0x00, 0x00 }); NAMES.put("yellowgreen", new int[]{0x9a, 0xcd, 0x32, 0xff});
NAMES.put("limegreen", new int[] { 0x32, 0xcd, 0x32, 0x00 }); NAMES.put("olivedrab", new int[]{0x6b, 0x8e, 0x23, 0xff});
NAMES.put("linen", new int[] { 0xfa, 0xf0, 0xe6, 0x00 }); NAMES.put("olive", new int[]{0x80, 0x80, 0x00, 0xff});
NAMES.put("magenta", new int[] { 0xff, 0x00, 0xff, 0x00 }); NAMES.put("darkolivegreen", new int[]{0x55, 0x6b, 0x2f, 0xff});
NAMES.put("maroon", new int[] { 0x80, 0x00, 0x00, 0x00 }); NAMES.put("mediumaquamarine", new int[]{0x66, 0xcd, 0xaa, 0xff});
NAMES.put("mediumaquamarine", new int[] { 0x66, 0xcd, 0xaa, 0x00 }); NAMES.put("darkseagreen", new int[]{0x8f, 0xbc, 0x8f, 0xff});
NAMES.put("mediumblue", new int[] { 0x00, 0x00, 0xcd, 0x00 }); NAMES.put("lightseagreen", new int[]{0x20, 0xb2, 0xaa, 0xff});
NAMES.put("mediumorchid", new int[] { 0xba, 0x55, 0xd3, 0x00 }); NAMES.put("darkcyan", new int[]{0x00, 0x8b, 0x8b, 0xff});
NAMES.put("mediumpurple", new int[] { 0x93, 0x70, 0xdb, 0x00 }); NAMES.put("teal", new int[]{0x00, 0x80, 0x80, 0xff});
NAMES.put("mediumseagreen", new int[] { 0x3c, 0xb3, 0x71, 0x00 });
NAMES.put("mediumslateblue", new int[] { 0x7b, 0x68, 0xee, 0x00 }); //Blue color names
NAMES.put("mediumspringgreen", new int[] { 0x00, 0xfa, 0x9a, 0x00 }); NAMES.put("aqua", new int[]{0x00, 0xff, 0xff, 0xff});
NAMES.put("mediumturquoise", new int[] { 0x48, 0xd1, 0xcc, 0x00 }); NAMES.put("cyan", new int[]{0x00, 0xff, 0xff, 0xff});
NAMES.put("mediumvioletred", new int[] { 0xc7, 0x15, 0x85, 0x00 }); NAMES.put("lightcyan", new int[]{0xe0, 0xff, 0xff, 0xff});
NAMES.put("midnightblue", new int[] { 0x19, 0x19, 0x70, 0x00 }); NAMES.put("paleturquoise", new int[]{0xaf, 0xee, 0xee, 0xff});
NAMES.put("mintcream", new int[] { 0xf5, 0xff, 0xfa, 0x00 }); NAMES.put("aquamarine", new int[]{0x7f, 0xff, 0xd4, 0xff});
NAMES.put("mistyrose", new int[] { 0xff, 0xe4, 0xe1, 0x00 }); NAMES.put("turquoise", new int[]{0x40, 0xe0, 0xd0, 0xff});
NAMES.put("moccasin", new int[] { 0xff, 0xe4, 0xb5, 0x00 }); NAMES.put("mediumturquoise", new int[]{0x48, 0xd1, 0xcc, 0xff});
NAMES.put("navajowhite", new int[] { 0xff, 0xde, 0xad, 0x00 }); NAMES.put("darkturquoise", new int[]{0x00, 0xce, 0xd1, 0xff});
NAMES.put("navy", new int[] { 0x00, 0x00, 0x80, 0x00 }); NAMES.put("cadetblue", new int[]{0x5f, 0x9e, 0xa0, 0xff});
NAMES.put("oldlace", new int[] { 0xfd, 0xf5, 0xe6, 0x00 }); NAMES.put("steelblue", new int[]{0x46, 0x82, 0xb4, 0xff});
NAMES.put("olive", new int[] { 0x80, 0x80, 0x00, 0x00 }); NAMES.put("lightsteelblue", new int[]{0xb0, 0xc4, 0xde, 0xff});
NAMES.put("olivedrab", new int[] { 0x6b, 0x8e, 0x23, 0x00 }); NAMES.put("powderblue", new int[]{0xb0, 0xe0, 0xe6, 0xff});
NAMES.put("orange", new int[] { 0xff, 0xa5, 0x00, 0x00 }); NAMES.put("lightblue", new int[]{0xad, 0xd8, 0xe6, 0xff});
NAMES.put("orangered", new int[] { 0xff, 0x45, 0x00, 0x00 }); NAMES.put("skyblue", new int[]{0x87, 0xce, 0xeb, 0xff});
NAMES.put("orchid", new int[] { 0xda, 0x70, 0xd6, 0x00 }); NAMES.put("lightskyblue", new int[]{0x87, 0xce, 0xfa, 0xff});
NAMES.put("palegoldenrod", new int[] { 0xee, 0xe8, 0xaa, 0x00 }); NAMES.put("deepskyblue", new int[]{0x00, 0xbf, 0xff, 0xff});
NAMES.put("palegreen", new int[] { 0x98, 0xfb, 0x98, 0x00 }); NAMES.put("dodgerblue", new int[]{0x1e, 0x90, 0xff, 0xff});
NAMES.put("paleturquoise", new int[] { 0xaf, 0xee, 0xee, 0x00 }); NAMES.put("cornflowerblue", new int[]{0x64, 0x95, 0xed, 0xff});
NAMES.put("palevioletred", new int[] { 0xdb, 0x70, 0x93, 0x00 }); NAMES.put("royalblue", new int[]{0x41, 0x69, 0xe1, 0xff});
NAMES.put("papayawhip", new int[] { 0xff, 0xef, 0xd5, 0x00 }); NAMES.put("blue", new int[]{0x00, 0x00, 0xff, 0xff});
NAMES.put("peachpuff", new int[] { 0xff, 0xda, 0xb9, 0x00 }); NAMES.put("mediumblue", new int[]{0x00, 0x00, 0xcd, 0xff});
NAMES.put("peru", new int[] { 0xcd, 0x85, 0x3f, 0x00 }); NAMES.put("darkblue", new int[]{0x00, 0x00, 0x8b, 0xff});
NAMES.put("pink", new int[] { 0xff, 0xc0, 0xcb, 0x00 }); NAMES.put("navy", new int[]{0x00, 0x00, 0x80, 0xff});
NAMES.put("plum", new int[] { 0xdd, 0xa0, 0xdd, 0x00 }); NAMES.put("midnightblue", new int[]{0x19, 0x19, 0x70, 0xff});
NAMES.put("powderblue", new int[] { 0xb0, 0xe0, 0xe6, 0x00 });
NAMES.put("purple", new int[] { 0x80, 0x00, 0x80, 0x00 }); //Brown color names
NAMES.put("red", new int[] { 0xff, 0x00, 0x00, 0x00 }); NAMES.put("cornsilk", new int[]{0xff, 0xf8, 0xdc, 0xff});
NAMES.put("rosybrown", new int[] { 0xbc, 0x8f, 0x8f, 0x00 }); NAMES.put("blanchedalmond", new int[]{0xff, 0xeb, 0xcd, 0xff});
NAMES.put("royalblue", new int[] { 0x41, 0x69, 0xe1, 0x00 }); NAMES.put("bisque", new int[]{0xff, 0xe4, 0xc4, 0xff});
NAMES.put("saddlebrown", new int[] { 0x8b, 0x45, 0x13, 0x00 }); NAMES.put("navajowhite", new int[]{0xff, 0xde, 0xad, 0xff});
NAMES.put("salmon", new int[] { 0xfa, 0x80, 0x72, 0x00 }); NAMES.put("wheat", new int[]{0xf5, 0xde, 0xb3, 0xff});
NAMES.put("sandybrown", new int[] { 0xf4, 0xa4, 0x60, 0x00 }); NAMES.put("burlywood", new int[]{0xde, 0xb8, 0x87, 0xff});
NAMES.put("seagreen", new int[] { 0x2e, 0x8b, 0x57, 0x00 }); NAMES.put("tan", new int[]{0xd2, 0xb4, 0x8c, 0xff});
NAMES.put("seashell", new int[] { 0xff, 0xf5, 0xee, 0x00 }); NAMES.put("rosybrown", new int[]{0xbc, 0x8f, 0x8f, 0xff});
NAMES.put("sienna", new int[] { 0xa0, 0x52, 0x2d, 0x00 }); NAMES.put("sandybrown", new int[]{0xf4, 0xa4, 0x60, 0xff});
NAMES.put("silver", new int[] { 0xc0, 0xc0, 0xc0, 0x00 }); NAMES.put("goldenrod", new int[]{0xda, 0xa5, 0x20, 0xff});
NAMES.put("skyblue", new int[] { 0x87, 0xce, 0xeb, 0x00 }); NAMES.put("darkgoldenrod", new int[]{0xb8, 0x86, 0x0b, 0xff});
NAMES.put("slateblue", new int[] { 0x6a, 0x5a, 0xcd, 0x00 }); NAMES.put("peru", new int[]{0xcd, 0x85, 0x3f, 0xff});
NAMES.put("slategray", new int[] { 0x70, 0x80, 0x90, 0x00 }); NAMES.put("chocolate", new int[]{0xd2, 0x69, 0x1e, 0xff});
NAMES.put("snow", new int[] { 0xff, 0xfa, 0xfa, 0x00 }); NAMES.put("saddlebrown", new int[]{0x8b, 0x45, 0x13, 0xff});
NAMES.put("springgreen", new int[] { 0x00, 0xff, 0x7f, 0x00 }); NAMES.put("sienna", new int[]{0xa0, 0x52, 0x2d, 0xff});
NAMES.put("steelblue", new int[] { 0x46, 0x82, 0xb4, 0x00 }); NAMES.put("brown", new int[]{0xa5, 0x2a, 0x2a, 0xff});
NAMES.put("tan", new int[] { 0xd2, 0xb4, 0x8c, 0x00 }); NAMES.put("maroon", new int[]{0x80, 0x00, 0x00, 0xff});
NAMES.put("transparent", new int[] { 0x00, 0x00, 0x00, 0xff });
NAMES.put("teal", new int[] { 0x00, 0x80, 0x80, 0x00 }); //White color names
NAMES.put("thistle", new int[] { 0xd8, 0xbf, 0xd8, 0x00 }); NAMES.put("white", new int[]{0xff, 0xff, 0xff, 0xff});
NAMES.put("tomato", new int[] { 0xff, 0x63, 0x47, 0x00 }); NAMES.put("snow", new int[]{0xff, 0xfa, 0xfa, 0xff});
NAMES.put("turquoise", new int[] { 0x40, 0xe0, 0xd0, 0x00 }); NAMES.put("honeydew", new int[]{0xf0, 0xff, 0xf0, 0xff});
NAMES.put("violet", new int[] { 0xee, 0x82, 0xee, 0x00 }); NAMES.put("mintcream", new int[]{0xf5, 0xff, 0xfa, 0xff});
NAMES.put("wheat", new int[] { 0xf5, 0xde, 0xb3, 0x00 }); NAMES.put("azure", new int[]{0xf0, 0xff, 0xff, 0xff});
NAMES.put("white", new int[] { 0xff, 0xff, 0xff, 0x00 }); NAMES.put("aliceblue", new int[]{0xf0, 0xf8, 0xff, 0xff});
NAMES.put("whitesmoke", new int[] { 0xf5, 0xf5, 0xf5, 0x00 }); NAMES.put("ghostwhite", new int[]{0xf8, 0xf8, 0xff, 0xff});
NAMES.put("yellow", new int[] { 0xff, 0xff, 0x00, 0x00 }); NAMES.put("whitesmoke", new int[]{0xf5, 0xf5, 0xf5, 0xff});
NAMES.put("yellowgreen", new int[] { 0x9, 0xacd, 0x32, 0x00 }); NAMES.put("seashell", new int[]{0xff, 0xf5, 0xee, 0xff});
NAMES.put("beige", new int[]{0xf5, 0xf5, 0xdc, 0xff});
NAMES.put("oldlace", new int[]{0xfd, 0xf5, 0xe6, 0xff});
NAMES.put("floralwhite", new int[]{0xff, 0xfa, 0xf0, 0xff});
NAMES.put("ivory", new int[]{0xff, 0xff, 0xf0, 0xff});
NAMES.put("antiquewhite", new int[]{0xfa, 0xeb, 0xd7, 0xff});
NAMES.put("linen", new int[]{0xfa, 0xf0, 0xe6, 0xff});
NAMES.put("lavenderblush", new int[]{0xff, 0xf0, 0xf5, 0xff});
NAMES.put("mistyrose", new int[]{0xff, 0xe4, 0xe1, 0xff});
//Grey color names
NAMES.put("gainsboro", new int[]{0xdc, 0xdc, 0xdc, 0xff});
NAMES.put("lightgrey", new int[]{0xd3, 0xd3, 0xd3, 0xff});
NAMES.put("silver", new int[]{0xc0, 0xc0, 0xc0, 0xff});
NAMES.put("darkgray", new int[]{0xa9, 0xa9, 0xa9, 0xff});
NAMES.put("gray", new int[]{0x80, 0x80, 0x80, 0xff});
NAMES.put("dimgray", new int[]{0x69, 0x69, 0x69, 0xff});
NAMES.put("lightslategray", new int[]{0x77, 0x88, 0x99, 0xff});
NAMES.put("slategray", new int[]{0x70, 0x80, 0x90, 0xff});
NAMES.put("darkslategray", new int[]{0x2f, 0x4f, 0x4f, 0xff});
NAMES.put("black", new int[]{0x00, 0x00, 0x00, 0xff});
//Transparent color names
NAMES.put("transparent", new int[]{0xff, 0xff, 0xff, 0x00});
} }
/** /**
@ -258,6 +281,6 @@ public class WebColors extends HashMap {
throw new IllegalArgumentException("Color '" + name throw new IllegalArgumentException("Color '" + name
+ "' not found."); + "' not found.");
c = (int[]) NAMES.get(name); c = (int[]) NAMES.get(name);
return new Color(c[0], c[1], c[2], 255); return new Color(c[0], c[1], c[2], c[3]);
} }
} }

9
fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java

@ -810,10 +810,15 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
public static final HashMap tagsSupported = new HashMap(); public static final HashMap tagsSupported = new HashMap();
public static final HashMap tagsPrefixSupported = new HashMap();
static { static {
StringTokenizer tok = new StringTokenizer(tagsSupportedString); StringTokenizer tok = new StringTokenizer(tagsSupportedString);
while (tok.hasMoreTokens()) while (tok.hasMoreTokens()){
tagsSupported.put(tok.nextToken(), null); String s = tok.nextToken();
tagsSupported.put(s, null);
tagsPrefixSupported.put(s.charAt(0), null);
}
} }
} }

30
fine-itext/src/com/fr/third/v2/lowagie/text/xml/simpleparser/SimpleXMLParser.java

@ -75,6 +75,8 @@
*/ */
package com.fr.third.v2.lowagie.text.xml.simpleparser; package com.fr.third.v2.lowagie.text.xml.simpleparser;
import com.fr.third.v2.lowagie.text.html.simpleparser.HTMLWorker;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -229,16 +231,13 @@ public final class SimpleXMLParser {
// we are in an unknown state before there's actual content // we are in an unknown state before there's actual content
case UNKNOWN: case UNKNOWN:
if(character == '<') { if(character == '<') {
saveState(TEXT); beginnOfTag((char) reader.read(), UNKNOWN);
state = TAG_ENCOUNTERED;
} }
break; break;
// we can encounter any content // we can encounter any content
case TEXT: case TEXT:
if(character == '<') { if(character == '<') {
flush(); beginnOfTag((char) reader.read(), TEXT);
saveState(state);
state = TAG_ENCOUNTERED;
} else if(character == '&') { } else if(character == '&') {
saveState(state); saveState(state);
entity.setLength(0); entity.setLength(0);
@ -486,6 +485,27 @@ public final class SimpleXMLParser {
} }
} }
/**
* 处理标签的开头若不在支持标签范围内<符号作为文本处理<1111 (仿造浏览器的处理方式)
*/
public void beginnOfTag(char c, int type) {
previousCharacter = c;
if (c == -1) {
return;
}
if (c == '/' || HTMLWorker.tagsPrefixSupported.containsKey(c)) {
if (type == TEXT) {
flush();
}
saveState(TEXT);
state = TAG_ENCOUNTERED;
return;
}
text.append((char) character);
nowhite = true;
}
/** /**
* Gets a state from the stack * Gets a state from the stack
* @return the previous state * @return the previous state

1
fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

@ -39,6 +39,7 @@ public class XMLEntityReaderImpl extends XMLEntityReader
XMLEntityReaderImpl.validContent[i] = true; XMLEntityReaderImpl.validContent[i] = true;
} }
XMLEntityReaderImpl.validContent[9] = true; XMLEntityReaderImpl.validContent[9] = true;
XMLEntityReaderImpl.validContent[10] = true;
XMLEntityReaderImpl.validContent[38] = false; XMLEntityReaderImpl.validContent[38] = false;
XMLEntityReaderImpl.validContent[60] = false; XMLEntityReaderImpl.validContent[60] = false;
for (int j = 65; j <= 90; ++j) { for (int j = 65; j <= 90; ++j) {

Loading…
Cancel
Save