Porting update.
git-svn-id: svn://svn.code.sf.net/p/itextsharp/code/trunk@29 820d3149-562b-4f88-9aa4-a8e61a3485cfmaster
parent
9084839eac
commit
5b3065c1df
File diff suppressed because it is too large
Load Diff
|
@ -271,8 +271,7 @@ namespace iTextSharp.text.pdf {
|
|||
foreach (DictionaryEntry entry in af.Fields) {
|
||||
String fn = (String)entry.Key;
|
||||
AcroFields.Item item = (AcroFields.Item)entry.Value;
|
||||
PdfDictionary dic = (PdfDictionary)item.merged[0];
|
||||
//PdfDictionary dic = item.GetMerged(0);
|
||||
PdfDictionary dic = item.GetMerged(0);
|
||||
PdfObject v = PdfReader.GetPdfObjectRelease(dic.Get(PdfName.V));
|
||||
if (v == null)
|
||||
continue;
|
||||
|
|
|
@ -401,7 +401,27 @@ namespace iTextSharp.text.pdf {
|
|||
public void AddAnnotation(PdfAnnotation annot, int page) {
|
||||
stamper.AddAnnotation(annot, page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Adds an empty signature.
|
||||
* @param name the name of the signature
|
||||
* @param page the page number
|
||||
* @param llx lower left x coordinate of the signature's position
|
||||
* @param lly lower left y coordinate of the signature's position
|
||||
* @param urx upper right x coordinate of the signature's position
|
||||
* @param ury upper right y coordinate of the signature's position
|
||||
* @return a signature form field
|
||||
* @since 2.1.4
|
||||
*/
|
||||
public PdfFormField AddSignature(String name, int page, float llx, float lly, float urx, float ury) {
|
||||
PdfAcroForm acroForm = stamper.AcroForm;
|
||||
PdfFormField signature = PdfFormField.CreateSignature(stamper);
|
||||
acroForm.SetSignatureParams(signature, name, llx, lly, urx, ury);
|
||||
acroForm.DrawSignatureAppearences(signature, llx, lly, urx, ury);
|
||||
AddAnnotation(signature, page);
|
||||
return signature;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the comments present in an FDF file.
|
||||
* @param fdf the FDF file
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -109,12 +109,11 @@ namespace iTextSharp.text.pdf {
|
|||
PdfString title = (PdfString)PdfReader.GetPdfObjectRelease(outline.Get(PdfName.TITLE));
|
||||
map["Title"] = title.ToUnicodeString();
|
||||
PdfArray color = (PdfArray)PdfReader.GetPdfObjectRelease(outline.Get(PdfName.C));
|
||||
if (color != null && color.ArrayList.Count == 3) {
|
||||
if (color != null && color.Size == 3) {
|
||||
ByteBuffer outp = new ByteBuffer();
|
||||
ArrayList arr = color.ArrayList;
|
||||
outp.Append(((PdfNumber)arr[0]).FloatValue).Append(' ');
|
||||
outp.Append(((PdfNumber)arr[1]).FloatValue).Append(' ');
|
||||
outp.Append(((PdfNumber)arr[2]).FloatValue);
|
||||
outp.Append(color.GetAsNumber(0).FloatValue).Append(' ');
|
||||
outp.Append(color.GetAsNumber(1).FloatValue).Append(' ');
|
||||
outp.Append(color.GetAsNumber(2).FloatValue);
|
||||
map["Color"] = PdfEncodings.ConvertToString(outp.ToByteArray(), null);
|
||||
}
|
||||
PdfNumber style = (PdfNumber)PdfReader.GetPdfObjectRelease(outline.Get(PdfName.F));
|
||||
|
@ -158,11 +157,11 @@ namespace iTextSharp.text.pdf {
|
|||
else if (dest.IsName())
|
||||
map["NamedN"] = PdfName.DecodeName(dest.ToString());
|
||||
else if (dest.IsArray()) {
|
||||
ArrayList arr = ((PdfArray)dest).ArrayList;
|
||||
PdfArray arr = (PdfArray)dest;
|
||||
StringBuilder s = new StringBuilder();
|
||||
s.Append(arr[0].ToString());
|
||||
s.Append(' ').Append(arr[1].ToString());
|
||||
for (int k = 2; k < arr.Count; ++k)
|
||||
for (int k = 2; k < arr.Size; ++k)
|
||||
s.Append(' ').Append(arr[k].ToString());
|
||||
map["Page"] = s.ToString();
|
||||
}
|
||||
|
@ -226,15 +225,15 @@ namespace iTextSharp.text.pdf {
|
|||
|
||||
private static String MakeBookmarkParam(PdfArray dest, IntHashtable pages)
|
||||
{
|
||||
ArrayList arr = dest.ArrayList;
|
||||
StringBuilder s = new StringBuilder();
|
||||
if (((PdfObject)arr[0]).IsNumber())
|
||||
s.Append(((PdfNumber)arr[0]).IntValue + 1);
|
||||
PdfObject obj = dest[0];
|
||||
if (obj.IsNumber())
|
||||
s.Append(((PdfNumber)obj).IntValue + 1);
|
||||
else
|
||||
s.Append(pages[GetNumber((PdfIndirectReference)arr[0])]); //changed by ujihara 2004-06-13
|
||||
s.Append(' ').Append(arr[1].ToString().Substring(1));
|
||||
for (int k = 2; k < arr.Count; ++k)
|
||||
s.Append(' ').Append(arr[k].ToString());
|
||||
s.Append(pages[GetNumber((PdfIndirectReference)obj)]); //changed by ujihara 2004-06-13
|
||||
s.Append(' ').Append(dest[1].ToString().Substring(1));
|
||||
for (int k = 2; k < dest.Size; ++k)
|
||||
s.Append(' ').Append(dest[k].ToString());
|
||||
return s.ToString();
|
||||
}
|
||||
|
||||
|
@ -250,7 +249,7 @@ namespace iTextSharp.text.pdf {
|
|||
if (pdfObj.Contains(PdfName.TYPE) && pdfObj.Get(PdfName.TYPE).Equals(PdfName.PAGES) && pdfObj.Contains(PdfName.KIDS))
|
||||
{
|
||||
PdfArray kids = (PdfArray)pdfObj.Get(PdfName.KIDS);
|
||||
indirect = (PdfIndirectReference)kids.ArrayList[0];
|
||||
indirect = (PdfIndirectReference)kids[0];
|
||||
}
|
||||
return indirect.Number;
|
||||
}
|
||||
|
|
|
@ -73,12 +73,12 @@ namespace iTextSharp.text.pdf {
|
|||
String[] keys = new String[names.Count];
|
||||
names.Keys.CopyTo(keys, 0);
|
||||
foreach (String name in keys) {
|
||||
ArrayList arr = ((PdfArray)names[name]).ArrayList;
|
||||
PdfArray arr = (PdfArray)names[name];
|
||||
StringBuilder s = new StringBuilder();
|
||||
try {
|
||||
s.Append(pages[((PdfIndirectReference)arr[0]).Number]);
|
||||
s.Append(pages[(arr.GetAsIndirectObject(0)).Number]);
|
||||
s.Append(' ').Append(arr[1].ToString().Substring(1));
|
||||
for (int k = 2; k < arr.Count; ++k)
|
||||
for (int k = 2; k < arr.Size; ++k)
|
||||
s.Append(' ').Append(arr[k].ToString());
|
||||
names[name] = s.ToString();
|
||||
}
|
||||
|
|
|
@ -2,222 +2,248 @@ using System;
|
|||
using System.IO;
|
||||
using System.Collections;
|
||||
using iTextSharp.text.xml.simpleparser;
|
||||
/*
|
||||
*
|
||||
* Copyright 2004 by Leonard Rosenthol.
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version 1.1
|
||||
* (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is 'iText, a free JAVA-PDF library'.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
|
||||
* the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
|
||||
* All Rights Reserved.
|
||||
* Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
|
||||
* are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s): all the names of the contributors are added in the source code
|
||||
* where applicable.
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of the
|
||||
* LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
|
||||
* provisions of LGPL are applicable instead of those above. If you wish to
|
||||
* allow use of your version of this file only under the terms of the LGPL
|
||||
* License and not to allow others to use your version of this file under
|
||||
* the MPL, indicate your decision by deleting the provisions above and
|
||||
* replace them with the notice and other provisions required by the LGPL.
|
||||
* If you do not delete the provisions above, a recipient may use your version
|
||||
* of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the MPL as stated above or under the terms of the GNU
|
||||
* Library General Public License as published by the Free Software Foundation;
|
||||
* either version 2 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
|
||||
* details.
|
||||
*
|
||||
* If you didn't download this code from the following link, you should check if
|
||||
* you aren't using an obsolete version:
|
||||
* http://www.lowagie.com/iText/
|
||||
*/
|
||||
/*
|
||||
*
|
||||
* Copyright 2004 by Leonard Rosenthol.
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version 1.1
|
||||
* (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is 'iText, a free JAVA-PDF library'.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
|
||||
* the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
|
||||
* All Rights Reserved.
|
||||
* Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
|
||||
* are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s): all the names of the contributors are added in the source code
|
||||
* where applicable.
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of the
|
||||
* LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
|
||||
* provisions of LGPL are applicable instead of those above. If you wish to
|
||||
* allow use of your version of this file only under the terms of the LGPL
|
||||
* License and not to allow others to use your version of this file under
|
||||
* the MPL, indicate your decision by deleting the provisions above and
|
||||
* replace them with the notice and other provisions required by the LGPL.
|
||||
* If you do not delete the provisions above, a recipient may use your version
|
||||
* of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the MPL as stated above or under the terms of the GNU
|
||||
* Library General Public License as published by the Free Software Foundation;
|
||||
* either version 2 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
|
||||
* details.
|
||||
*
|
||||
* If you didn't download this code from the following link, you should check if
|
||||
* you aren't using an obsolete version:
|
||||
* http://www.lowagie.com/iText/
|
||||
*/
|
||||
|
||||
namespace iTextSharp.text.pdf {
|
||||
/**
|
||||
* Reads a XFDF.
|
||||
* @author Leonard Rosenthol (leonardr@pdfsages.com)
|
||||
*/
|
||||
public class XfdfReader : ISimpleXMLDocHandler {
|
||||
// stuff used during parsing to handle state
|
||||
private bool foundRoot = false;
|
||||
private Stackr fieldNames = new Stackr();
|
||||
private Stackr fieldValues = new Stackr();
|
||||
|
||||
// storage for the field list and their values
|
||||
internal Hashtable fields;
|
||||
|
||||
// storage for the path to referenced PDF, if any
|
||||
internal String fileSpec;
|
||||
|
||||
/** Reads an XFDF form.
|
||||
* @param filename the file name of the form
|
||||
* @throws IOException on error
|
||||
*/
|
||||
public XfdfReader(String filename) {
|
||||
FileStream fin = null;
|
||||
try {
|
||||
fin = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
SimpleXMLParser.Parse(this, fin);
|
||||
}
|
||||
finally {
|
||||
try{if (fin != null) fin.Close();}catch{}
|
||||
}
|
||||
}
|
||||
|
||||
/** Reads an XFDF form.
|
||||
* @param xfdfIn the byte array with the form
|
||||
* @throws IOException on error
|
||||
*/
|
||||
public XfdfReader(byte[] xfdfIn) {
|
||||
SimpleXMLParser.Parse( this, new MemoryStream(xfdfIn));
|
||||
}
|
||||
|
||||
/** Gets all the fields. The map is keyed by the fully qualified
|
||||
* field name and the value is a merged <CODE>PdfDictionary</CODE>
|
||||
* with the field content.
|
||||
* @return all the fields
|
||||
*/
|
||||
public Hashtable Fields {
|
||||
get {
|
||||
return fields;
|
||||
}
|
||||
}
|
||||
|
||||
/** Gets the field value.
|
||||
* @param name the fully qualified field name
|
||||
* @return the field's value
|
||||
*/
|
||||
public String GetField(String name) {
|
||||
return (String)fields[name];
|
||||
}
|
||||
|
||||
/** Gets the field value or <CODE>null</CODE> if the field does not
|
||||
/**
|
||||
* Reads a XFDF.
|
||||
* @author Leonard Rosenthol (leonardr@pdfsages.com)
|
||||
*/
|
||||
public class XfdfReader : ISimpleXMLDocHandler {
|
||||
// stuff used during parsing to handle state
|
||||
private bool foundRoot = false;
|
||||
private Stackr fieldNames = new Stackr();
|
||||
private Stackr fieldValues = new Stackr();
|
||||
|
||||
// storage for the field list and their values
|
||||
internal Hashtable fields;
|
||||
/**
|
||||
* Storage for field values if there's more than one value for a field.
|
||||
* @since 2.1.4
|
||||
*/
|
||||
protected Hashtable listFields;
|
||||
// storage for the path to referenced PDF, if any
|
||||
internal String fileSpec;
|
||||
|
||||
/** Reads an XFDF form.
|
||||
* @param filename the file name of the form
|
||||
* @throws IOException on error
|
||||
*/
|
||||
public XfdfReader(String filename) {
|
||||
FileStream fin = null;
|
||||
try {
|
||||
fin = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
SimpleXMLParser.Parse(this, fin);
|
||||
}
|
||||
finally {
|
||||
try{if (fin != null) fin.Close();}catch{}
|
||||
}
|
||||
}
|
||||
|
||||
/** Reads an XFDF form.
|
||||
* @param xfdfIn the byte array with the form
|
||||
* @throws IOException on error
|
||||
*/
|
||||
public XfdfReader(byte[] xfdfIn) {
|
||||
SimpleXMLParser.Parse( this, new MemoryStream(xfdfIn));
|
||||
}
|
||||
|
||||
/** Gets all the fields. The map is keyed by the fully qualified
|
||||
* field name and the value is a merged <CODE>PdfDictionary</CODE>
|
||||
* with the field content.
|
||||
* @return all the fields
|
||||
*/
|
||||
public Hashtable Fields {
|
||||
get {
|
||||
return fields;
|
||||
}
|
||||
}
|
||||
|
||||
/** Gets the field value.
|
||||
* @param name the fully qualified field name
|
||||
* @return the field's value
|
||||
*/
|
||||
public String GetField(String name) {
|
||||
return (String)fields[name];
|
||||
}
|
||||
|
||||
/** Gets the field value or <CODE>null</CODE> if the field does not
|
||||
* exist or has no value defined.
|
||||
* @param name the fully qualified field name
|
||||
* @return the field value or <CODE>null</CODE>
|
||||
*/
|
||||
public String GetFieldValue(String name) {
|
||||
String field = (String)fields[name];
|
||||
if (field == null)
|
||||
return null;
|
||||
else
|
||||
return field;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the field values for a list or <CODE>null</CODE> if the field does not
|
||||
* exist or has no value defined.
|
||||
* @param name the fully qualified field name
|
||||
* @return the field value or <CODE>null</CODE>
|
||||
* @return the field values or <CODE>null</CODE>
|
||||
* @since 2.1.4
|
||||
*/
|
||||
public String GetFieldValue(String name) {
|
||||
String field = (String)fields[name];
|
||||
if (field == null)
|
||||
return null;
|
||||
else
|
||||
return field;
|
||||
public ArrayList GetListValues(String name) {
|
||||
return (ArrayList)listFields[name];
|
||||
}
|
||||
|
||||
/** Gets the PDF file specification contained in the FDF.
|
||||
* @return the PDF file specification contained in the FDF
|
||||
*/
|
||||
public String FileSpec {
|
||||
get {
|
||||
return fileSpec;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when a start tag is found.
|
||||
* @param tag the tag name
|
||||
* @param h the tag's attributes
|
||||
*/
|
||||
public void StartElement(String tag, Hashtable h) {
|
||||
if ( !foundRoot ) {
|
||||
if (!tag.Equals("xfdf"))
|
||||
throw new Exception("Root element is not Bookmark.");
|
||||
else
|
||||
foundRoot = true;
|
||||
}
|
||||
|
||||
if ( tag.Equals("xfdf") ){
|
||||
|
||||
} else if ( tag.Equals("f") ) {
|
||||
fileSpec = (String)h[ "href" ];
|
||||
} else if ( tag.Equals("fields") ) {
|
||||
fields = new Hashtable(); // init it!
|
||||
} else if ( tag.Equals("field") ) {
|
||||
String fName = (String) h[ "name" ];
|
||||
fieldNames.Push( fName );
|
||||
} else if ( tag.Equals("value") ) {
|
||||
fieldValues.Push("");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Called when an end tag is found.
|
||||
* @param tag the tag name
|
||||
*/
|
||||
public void EndElement(String tag) {
|
||||
if ( tag.Equals("value") ) {
|
||||
String fName = "";
|
||||
for (int k = 0; k < fieldNames.Count; ++k) {
|
||||
fName += "." + (String)fieldNames[k];
|
||||
}
|
||||
if (fName.StartsWith("."))
|
||||
fName = fName.Substring(1);
|
||||
String fVal = (String) fieldValues.Pop();
|
||||
|
||||
/** Gets the PDF file specification contained in the FDF.
|
||||
* @return the PDF file specification contained in the FDF
|
||||
*/
|
||||
public String FileSpec {
|
||||
get {
|
||||
return fileSpec;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when a start tag is found.
|
||||
* @param tag the tag name
|
||||
* @param h the tag's attributes
|
||||
*/
|
||||
public void StartElement(String tag, Hashtable h) {
|
||||
if ( !foundRoot ) {
|
||||
if (!tag.Equals("xfdf"))
|
||||
throw new Exception("Root element is not Bookmark.");
|
||||
else
|
||||
foundRoot = true;
|
||||
}
|
||||
|
||||
if ( tag.Equals("xfdf") ){
|
||||
|
||||
} else if ( tag.Equals("f") ) {
|
||||
fileSpec = (String)h[ "href" ];
|
||||
} else if ( tag.Equals("fields") ) {
|
||||
fields = new Hashtable(); // init it!
|
||||
listFields = new Hashtable();
|
||||
} else if ( tag.Equals("field") ) {
|
||||
String fName = (String) h[ "name" ];
|
||||
fieldNames.Push( fName );
|
||||
} else if ( tag.Equals("value") ) {
|
||||
fieldValues.Push("");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Called when an end tag is found.
|
||||
* @param tag the tag name
|
||||
*/
|
||||
public void EndElement(String tag) {
|
||||
if ( tag.Equals("value") ) {
|
||||
String fName = "";
|
||||
for (int k = 0; k < fieldNames.Count; ++k) {
|
||||
fName += "." + (String)fieldNames[k];
|
||||
}
|
||||
if (fName.StartsWith("."))
|
||||
fName = fName.Substring(1);
|
||||
String fVal = (String) fieldValues.Pop();
|
||||
String old = (String)fields[fName];
|
||||
fields[fName] = fVal;
|
||||
}
|
||||
else if (tag.Equals("field") ) {
|
||||
if (fieldNames.Count != 0)
|
||||
fieldNames.Pop();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the document starts to be parsed.
|
||||
*/
|
||||
public void StartDocument()
|
||||
{
|
||||
fileSpec = ""; // and this too...
|
||||
}
|
||||
/**
|
||||
* Called after the document is parsed.
|
||||
*/
|
||||
public void EndDocument()
|
||||
{
|
||||
|
||||
}
|
||||
/**
|
||||
* Called when a text element is found.
|
||||
* @param str the text element, probably a fragment.
|
||||
*/
|
||||
public void Text(String str)
|
||||
{
|
||||
if (fieldNames.Count == 0 || fieldValues.Count == 0)
|
||||
return;
|
||||
|
||||
String val = (String)fieldValues.Pop();
|
||||
val += str;
|
||||
fieldValues.Push(val);
|
||||
}
|
||||
|
||||
internal class Stackr : ArrayList {
|
||||
internal void Push(object obj) {
|
||||
Add(obj);
|
||||
}
|
||||
|
||||
internal object Pop() {
|
||||
if (Count == 0)
|
||||
throw new InvalidOperationException("The stack is empty.");
|
||||
object obj = this[Count - 1];
|
||||
RemoveAt(Count - 1);
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (old != null) {
|
||||
ArrayList l = (ArrayList) listFields[fName];
|
||||
if (l == null) {
|
||||
l = new ArrayList();
|
||||
l.Add(old);
|
||||
}
|
||||
l.Add(fVal);
|
||||
listFields[fName] = l;
|
||||
}
|
||||
}
|
||||
else if (tag.Equals("field") ) {
|
||||
if (fieldNames.Count != 0)
|
||||
fieldNames.Pop();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the document starts to be parsed.
|
||||
*/
|
||||
public void StartDocument()
|
||||
{
|
||||
fileSpec = ""; // and this too...
|
||||
}
|
||||
/**
|
||||
* Called after the document is parsed.
|
||||
*/
|
||||
public void EndDocument()
|
||||
{
|
||||
|
||||
}
|
||||
/**
|
||||
* Called when a text element is found.
|
||||
* @param str the text element, probably a fragment.
|
||||
*/
|
||||
public void Text(String str)
|
||||
{
|
||||
if (fieldNames.Count == 0 || fieldValues.Count == 0)
|
||||
return;
|
||||
|
||||
String val = (String)fieldValues.Pop();
|
||||
val += str;
|
||||
fieldValues.Push(val);
|
||||
}
|
||||
|
||||
internal class Stackr : ArrayList {
|
||||
internal void Push(object obj) {
|
||||
Add(obj);
|
||||
}
|
||||
|
||||
internal object Pop() {
|
||||
if (Count == 0)
|
||||
throw new InvalidOperationException("The stack is empty.");
|
||||
object obj = this[Count - 1];
|
||||
RemoveAt(Count - 1);
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -129,6 +129,13 @@ namespace iTextSharp.text.xml.simpleparser {
|
|||
internal int columns = 0;
|
||||
/** was the last character equivalent to a newline? */
|
||||
internal bool eol = false;
|
||||
/**
|
||||
* A boolean indicating if the next character should be taken into account
|
||||
* if it's a space character. When nospace is false, the previous character
|
||||
* wasn't whitespace.
|
||||
* @since 2.1.5
|
||||
*/
|
||||
internal bool nowhite = false;
|
||||
/** the current state */
|
||||
internal int state;
|
||||
/** Are we parsing HTML? */
|
||||
|
@ -231,8 +238,14 @@ namespace iTextSharp.text.xml.simpleparser {
|
|||
SaveState(state);
|
||||
entity.Length = 0;
|
||||
state = ENTITY;
|
||||
} else
|
||||
} else if (Char.IsWhiteSpace((char)character)) {
|
||||
if (nowhite)
|
||||
text.Append((char)character);
|
||||
nowhite = false;
|
||||
} else {
|
||||
text.Append((char)character);
|
||||
nowhite = true;
|
||||
}
|
||||
break;
|
||||
// we have just seen a < and are wondering what we are looking at
|
||||
// <foo>, </foo>, <!-- ... --->, etc.
|
||||
|
@ -658,10 +671,15 @@ namespace iTextSharp.text.xml.simpleparser {
|
|||
sb.Append("'");
|
||||
break;
|
||||
default:
|
||||
if (onlyASCII && c > 127)
|
||||
sb.Append("&#").Append(c).Append(';');
|
||||
else
|
||||
sb.Append((char)c);
|
||||
if ((c == 0x9) || (c == 0xA) || (c == 0xD)
|
||||
|| ((c >= 0x20) && (c <= 0xD7FF))
|
||||
|| ((c >= 0xE000) && (c <= 0xFFFD))
|
||||
|| ((c >= 0x10000) && (c <= 0x10FFFF))) {
|
||||
if (onlyASCII && c > 127)
|
||||
sb.Append("&#").Append(c).Append(';');
|
||||
else
|
||||
sb.Append((char)c);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,7 +64,7 @@ namespace iTextSharp.text.xml.xmp {
|
|||
/** default namespace uri*/
|
||||
public const String DEFAULT_XPATH_URI = "http://ns.adobe.com/pdf/1.3/";
|
||||
/** Keywords. */
|
||||
public const String KEYWORDS = "pdf:Keywords";
|
||||
public const String KEYWORDS = "pdf:keywords";
|
||||
/** The PDF file version (for example: 1.0, 1.3, and so on). */
|
||||
public const String VERSION = "pdf:PDFVersion";
|
||||
/** The Producer. */
|
||||
|
|
Loading…
Reference in New Issue