You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ma...@apache.org on 2008/02/13 13:05:26 UTC
svn commit: r627367 [2/7] - in /xmlgraphics/fop/trunk: ./
examples/embedding/java/embedding/
examples/embedding/java/embedding/intermediate/
examples/mathml/src/org/apache/fop/mathml/
examples/plan/src/org/apache/fop/plan/ src/documentation/content/xdo...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java Wed Feb 13 04:03:30 2008
@@ -1,85 +1,85 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.apps;
-
-import java.util.List;
-
-import org.apache.fop.fo.pagination.AbstractPageSequence;
-
-/**
- * Class for reporting back formatting results to the calling application.
- */
-public class FormattingResults {
-
- private int pageCount = 0;
- private List pageSequences = null;
-
- /**
- * Constructor for the FormattingResults object
- */
- public FormattingResults() {
- }
-
- /**
- * Gets the number of pages rendered
- *
- * @return The number of pages overall
- */
- public int getPageCount() {
- return this.pageCount;
- }
-
- /**
- * Gets the results for the individual page-sequences.
- *
- * @return A List with PageSequenceResults objects
- */
- public List getPageSequences() {
- return this.pageSequences;
- }
-
- /**
- * Resets this object
- */
- public void reset() {
- this.pageCount = 0;
- if (this.pageSequences != null) {
- this.pageSequences.clear();
- }
- }
-
- /**
- * Reports the result of one page sequence rendering
- * back into this object.
- *
- * @param pageSequence the page sequence which just completed rendering
- * @param pageCount the number of pages rendered for that PageSequence
- */
- public void haveFormattedPageSequence(AbstractPageSequence pageSequence, int pageCount) {
- this.pageCount += pageCount;
- if (this.pageSequences == null) {
- this.pageSequences = new java.util.ArrayList();
- }
- this.pageSequences.add(
- new PageSequenceResults(pageSequence.getId(),
- pageCount));
- }
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+import java.util.List;
+
+import org.apache.fop.fo.pagination.AbstractPageSequence;
+
+/**
+ * Class for reporting back formatting results to the calling application.
+ */
+public class FormattingResults {
+
+ private int pageCount = 0;
+ private List pageSequences = null;
+
+ /**
+ * Constructor for the FormattingResults object
+ */
+ public FormattingResults() {
+ }
+
+ /**
+ * Gets the number of pages rendered
+ *
+ * @return The number of pages overall
+ */
+ public int getPageCount() {
+ return this.pageCount;
+ }
+
+ /**
+ * Gets the results for the individual page-sequences.
+ *
+ * @return A List with PageSequenceResults objects
+ */
+ public List getPageSequences() {
+ return this.pageSequences;
+ }
+
+ /**
+ * Resets this object
+ */
+ public void reset() {
+ this.pageCount = 0;
+ if (this.pageSequences != null) {
+ this.pageSequences.clear();
+ }
+ }
+
+ /**
+ * Reports the result of one page sequence rendering
+ * back into this object.
+ *
+ * @param pageSequence the page sequence which just completed rendering
+ * @param pageCount the number of pages rendered for that PageSequence
+ */
+ public void haveFormattedPageSequence(AbstractPageSequence pageSequence, int pageCount) {
+ this.pageCount += pageCount;
+ if (this.pageSequences == null) {
+ this.pageSequences = new java.util.ArrayList();
+ }
+ this.pageSequences.add(
+ new PageSequenceResults(pageSequence.getId(),
+ pageCount));
+ }
+}
+
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java Wed Feb 13 04:03:30 2008
@@ -1,80 +1,80 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.apps;
-
-/**
- * Frequently used MIME types for various file formats used when working with Apache FOP.
- */
-public interface MimeConstants {
-
- /** Portable Document Format */
- String MIME_PDF = "application/pdf";
-
- /** PostScript */
- String MIME_POSTSCRIPT = "application/postscript";
- /** Encapsulated PostScript (same MIME type as PostScript) */
- String MIME_EPS = MIME_POSTSCRIPT;
-
- /** HP's PCL */
- String MIME_PCL = "application/x-pcl";
- /** HP's PCL (alternative MIME type) */
- String MIME_PCL_ALT = "application/vnd.hp-PCL";
-
- /** IBM's AFP */
- String MIME_AFP = "application/x-afp";
- /** IBM's AFP (alternative MIME type) */
- String MIME_AFP_ALT = "application/vnd.ibm.modcap";
-
- /** Plain text */
- String MIME_PLAIN_TEXT = "text/plain";
-
- /** Rich text format */
- String MIME_RTF = "application/rtf";
- /** Rich text format (alternative 1) */
- String MIME_RTF_ALT1 = "text/richtext";
- /** Rich text format (alternative 2) */
- String MIME_RTF_ALT2 = "text/rtf";
-
- /** FrameMaker's MIF */
- String MIME_MIF = "application/mif";
-
- /** Structured Vector Graphics */
- String MIME_SVG = "image/svg+xml";
-
- /** GIF images */
- String MIME_GIF = "image/gif";
- /** PNG images */
- String MIME_PNG = "image/png";
- /** JPEG images */
- String MIME_JPEG = "image/jpeg";
- /** TIFF images */
- String MIME_TIFF = "image/tiff";
-
- /** Apache FOP's AWT preview (non-standard MIME type) */
- String MIME_FOP_AWT_PREVIEW = "application/X-fop-awt-preview";
- /** Apache FOP's Direct Printing (non-standard MIME type) */
- String MIME_FOP_PRINT = "application/X-fop-print";
- /** Apache FOP's area tree XML */
- String MIME_FOP_AREA_TREE = "application/X-fop-areatree";
-
- /** Proposed but non-registered MIME type for XSL-FO */
- String MIME_XSL_FO = "text/xsl";
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+/**
+ * Frequently used MIME types for various file formats used when working with Apache FOP.
+ */
+public interface MimeConstants {
+
+ /** Portable Document Format */
+ String MIME_PDF = "application/pdf";
+
+ /** PostScript */
+ String MIME_POSTSCRIPT = "application/postscript";
+ /** Encapsulated PostScript (same MIME type as PostScript) */
+ String MIME_EPS = MIME_POSTSCRIPT;
+
+ /** HP's PCL */
+ String MIME_PCL = "application/x-pcl";
+ /** HP's PCL (alternative MIME type) */
+ String MIME_PCL_ALT = "application/vnd.hp-PCL";
+
+ /** IBM's AFP */
+ String MIME_AFP = "application/x-afp";
+ /** IBM's AFP (alternative MIME type) */
+ String MIME_AFP_ALT = "application/vnd.ibm.modcap";
+
+ /** Plain text */
+ String MIME_PLAIN_TEXT = "text/plain";
+
+ /** Rich text format */
+ String MIME_RTF = "application/rtf";
+ /** Rich text format (alternative 1) */
+ String MIME_RTF_ALT1 = "text/richtext";
+ /** Rich text format (alternative 2) */
+ String MIME_RTF_ALT2 = "text/rtf";
+
+ /** FrameMaker's MIF */
+ String MIME_MIF = "application/mif";
+
+ /** Structured Vector Graphics */
+ String MIME_SVG = "image/svg+xml";
+
+ /** GIF images */
+ String MIME_GIF = "image/gif";
+ /** PNG images */
+ String MIME_PNG = "image/png";
+ /** JPEG images */
+ String MIME_JPEG = "image/jpeg";
+ /** TIFF images */
+ String MIME_TIFF = "image/tiff";
+
+ /** Apache FOP's AWT preview (non-standard MIME type) */
+ String MIME_FOP_AWT_PREVIEW = "application/X-fop-awt-preview";
+ /** Apache FOP's Direct Printing (non-standard MIME type) */
+ String MIME_FOP_PRINT = "application/X-fop-print";
+ /** Apache FOP's area tree XML */
+ String MIME_FOP_AREA_TREE = "application/X-fop-areatree";
+
+ /** Proposed but non-registered MIME type for XSL-FO */
+ String MIME_XSL_FO = "text/xsl";
+
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java Wed Feb 13 04:03:30 2008
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.apps;
-
-/**
- * Class for reporting back formatting results to the calling application. This
- * particular class is used to report the results of a single page-sequence.
- */
-public class PageSequenceResults {
-
- private String id;
- private int pageCount;
-
- /**
- * Constructor for the PageSequenceResults object
- *
- * @param id ID of the page-sequence, if available
- * @param pageCount The number of resulting pages
- */
- public PageSequenceResults(String id, int pageCount) {
- this.id = id;
- this.pageCount = pageCount;
- }
-
- /**
- * Gets the ID of the page-sequence if one was specified.
- *
- * @return The ID
- */
- public String getID() {
- return this.id;
- }
-
- /**
- * Gets the number of pages that resulted by processing the page-sequence.
- *
- * @return The number of pages generated
- */
- public int getPageCount() {
- return this.pageCount;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+/**
+ * Class for reporting back formatting results to the calling application. This
+ * particular class is used to report the results of a single page-sequence.
+ */
+public class PageSequenceResults {
+
+ private String id;
+ private int pageCount;
+
+ /**
+ * Constructor for the PageSequenceResults object
+ *
+ * @param id ID of the page-sequence, if available
+ * @param pageCount The number of resulting pages
+ */
+ public PageSequenceResults(String id, int pageCount) {
+ this.id = id;
+ this.pageCount = pageCount;
+ }
+
+ /**
+ * Gets the ID of the page-sequence if one was specified.
+ *
+ * @return The ID
+ */
+ public String getID() {
+ return this.id;
+ }
+
+ /**
+ * Gets the number of pages that resulted by processing the page-sequence.
+ *
+ * @return The number of pages generated
+ */
+ public int getPageCount() {
+ return this.pageCount;
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentItem.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageSequence.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Resolvable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java Wed Feb 13 04:03:30 2008
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-package org.apache.fop.area.inline;
-
-/**
- * A space
- */
-public class SpaceArea extends InlineArea {
-
- /**
- * The space for this space area
- */
- protected String space;
-
- /**
- * Is this space adjustable?
- */
- protected boolean isAdjustable;
-
- /**
- * Create a space area
- * @param s the space character
- * @param o the offset for the next area
- * @param a is this space adjustable?
- */
- public SpaceArea(char s, int o, boolean a) {
- space = new String() + s;
- offset = o;
- isAdjustable = a;
- }
-
- /**
- * @return Returns the space.
- */
- public String getSpace() {
- return new String(space);
- }
-
- /** @return true if the space is adjustable (WRT word-space processing) */
- public boolean isAdjustable() {
- return this.isAdjustable;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.area.inline;
+
+/**
+ * A space
+ */
+public class SpaceArea extends InlineArea {
+
+ /**
+ * The space for this space area
+ */
+ protected String space;
+
+ /**
+ * Is this space adjustable?
+ */
+ protected boolean isAdjustable;
+
+ /**
+ * Create a space area
+ * @param s the space character
+ * @param o the offset for the next area
+ * @param a is this space adjustable?
+ */
+ public SpaceArea(char s, int o, boolean a) {
+ space = new String() + s;
+ offset = o;
+ isAdjustable = a;
+ }
+
+ /**
+ * @return Returns the space.
+ */
+ public String getSpace() {
+ return new String(space);
+ }
+
+ /** @return true if the space is adjustable (WRT word-space processing) */
+ public boolean isAdjustable() {
+ return this.isAdjustable;
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java Wed Feb 13 04:03:30 2008
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-package org.apache.fop.area.inline;
-
-/**
- * A string of characters without spaces
- */
-public class WordArea extends InlineArea {
-
- /** The text for this word area */
- protected String word;
-
- /** The correction offset for the next area */
- protected int offset = 0;
-
- /** An array of width for adjusting the individual letters (optional) */
- protected int[] letterAdjust;
-
- /**
- * Create a word area
- * @param w the word string
- * @param o the offset for the next area
- * @param la the letter adjust array (may be null)
- */
- public WordArea(String w, int o, int[] la) {
- word = w;
- offset = o;
- this.letterAdjust = la;
- }
-
- /**
- * @return Returns the word.
- */
- public String getWord() {
- return word;
- }
-
- /**
- * @return Returns the offset.
- */
- public int getOffset() {
- return offset;
- }
- /**
- * @param o The offset to set.
- */
- public void setOffset(int o) {
- offset = o;
- }
-
- /** @return the array of letter adjust widths */
- public int[] getLetterAdjustArray() {
- return this.letterAdjust;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.area.inline;
+
+/**
+ * A string of characters without spaces
+ */
+public class WordArea extends InlineArea {
+
+ /** The text for this word area */
+ protected String word;
+
+ /** The correction offset for the next area */
+ protected int offset = 0;
+
+ /** An array of width for adjusting the individual letters (optional) */
+ protected int[] letterAdjust;
+
+ /**
+ * Create a word area
+ * @param w the word string
+ * @param o the offset for the next area
+ * @param la the letter adjust array (may be null)
+ */
+ public WordArea(String w, int o, int[] la) {
+ word = w;
+ offset = o;
+ this.letterAdjust = la;
+ }
+
+ /**
+ * @return Returns the word.
+ */
+ public String getWord() {
+ return word;
+ }
+
+ /**
+ * @return Returns the offset.
+ */
+ public int getOffset() {
+ return offset;
+ }
+ /**
+ * @param o The offset to set.
+ */
+ public void setOffset(int o) {
+ offset = o;
+ }
+
+ /** @return the array of letter adjust widths */
+ public int[] getLetterAdjustArray() {
+ return this.letterAdjust;
+ }
+
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyListMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/StaticPropertyList.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ValidationException.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericOp.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EffRow.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/ColorProfile.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SideRegion.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/StaticContent.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Title.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: ColorTypeProperty.java 377045 2006-02-11 20:23:47Z jeremias $ */
+/* $Id$ */
package org.apache.fop.fo.properties;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAccessibility.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumNumber.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthPairProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ListProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts.autodetect;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts.autodetect;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts.autodetect;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts.autodetect;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java Wed Feb 13 04:03:30 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.fonts.autodetect;
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java Wed Feb 13 04:03:30 2008
@@ -1,129 +1,129 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fonts.truetype;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.fop.fonts.BFEntry;
-import org.apache.fop.fonts.CIDFontType;
-import org.apache.fop.fonts.FontLoader;
-import org.apache.fop.fonts.FontResolver;
-import org.apache.fop.fonts.MultiByteFont;
-
-/**
- * Loads a font into memory directly from the original font file.
- */
-public class TTFFontLoader extends FontLoader {
-
- private MultiByteFont multiFont;
-
- /**
- * Default constructor
- * @param fontFileURI the URI representing the font file
- * @param in the InputStream to load the font from
- * @param resolver the FontResolver for font URI resolution
- */
- public TTFFontLoader(String fontFileURI, InputStream in, FontResolver resolver) {
- super(fontFileURI, in, resolver);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void read() throws IOException {
- TTFFile ttf = new TTFFile();
- FontFileReader reader = new FontFileReader(in);
- boolean supported = ttf.readFont(reader, null);
- if (!supported) {
- throw new IOException("Could not load TrueType font: " + fontFileURI);
- }
- if (ttf.isCFF()) {
- throw new UnsupportedOperationException(
- "OpenType fonts with CFF data are not supported, yet");
- }
- multiFont = new MultiByteFont();
- multiFont.setResolver(this.resolver);
- returnFont = multiFont;
-
- returnFont.setFontName(ttf.getPostScriptName());
- returnFont.setFullName(ttf.getFullName());
- returnFont.setFamilyNames(ttf.getFamilyNames());
- returnFont.setFontSubFamilyName(ttf.getSubFamilyName());
- //multiFont.setTTCName(ttcName)
- returnFont.setCapHeight(ttf.getCapHeight());
- returnFont.setXHeight(ttf.getXHeight());
- returnFont.setAscender(ttf.getLowerCaseAscent());
- returnFont.setDescender(ttf.getLowerCaseDescent());
- returnFont.setFontBBox(ttf.getFontBBox());
- //returnFont.setFirstChar(ttf.getFirstChar();)
- returnFont.setFlags(ttf.getFlags());
- returnFont.setStemV(Integer.parseInt(ttf.getStemV())); //not used for TTF
- returnFont.setItalicAngle(Integer.parseInt(ttf.getItalicAngle()));
- returnFont.setMissingWidth(0);
-
- multiFont.setCIDType(CIDFontType.CIDTYPE2);
- int[] wx = ttf.getWidths();
- multiFont.setWidthArray(wx);
- List entries = ttf.getCMaps();
- BFEntry[] bfentries = new BFEntry[entries.size()];
- int pos = 0;
- Iterator iter = ttf.getCMaps().listIterator();
- while (iter.hasNext()) {
- TTFCmapEntry ce = (TTFCmapEntry)iter.next();
- bfentries[pos] = new BFEntry(ce.getUnicodeStart(), ce.getUnicodeEnd(),
- ce.getGlyphStartIndex());
- pos++;
- }
- multiFont.setBFEntries(bfentries);
- copyKerning(ttf, true);
- multiFont.setEmbedFileName(this.fontFileURI);
- loaded = true;
- }
-
- /**
- * Copy kerning information.
- */
- private void copyKerning(TTFFile ttf, boolean isCid) {
-
- // Get kerning
- Iterator iter;
- if (isCid) {
- iter = ttf.getKerning().keySet().iterator();
- } else {
- iter = ttf.getAnsiKerning().keySet().iterator();
- }
-
- while (iter.hasNext()) {
- Integer kpx1 = (Integer)iter.next();
-
- Map h2;
- if (isCid) {
- h2 = (Map)ttf.getKerning().get(kpx1);
- } else {
- h2 = (Map)ttf.getAnsiKerning().get(kpx1);
- }
- returnFont.putKerningEntry(kpx1, h2);
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fonts.truetype;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.fop.fonts.BFEntry;
+import org.apache.fop.fonts.CIDFontType;
+import org.apache.fop.fonts.FontLoader;
+import org.apache.fop.fonts.FontResolver;
+import org.apache.fop.fonts.MultiByteFont;
+
+/**
+ * Loads a font into memory directly from the original font file.
+ */
+public class TTFFontLoader extends FontLoader {
+
+ private MultiByteFont multiFont;
+
+ /**
+ * Default constructor
+ * @param fontFileURI the URI representing the font file
+ * @param in the InputStream to load the font from
+ * @param resolver the FontResolver for font URI resolution
+ */
+ public TTFFontLoader(String fontFileURI, InputStream in, FontResolver resolver) {
+ super(fontFileURI, in, resolver);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void read() throws IOException {
+ TTFFile ttf = new TTFFile();
+ FontFileReader reader = new FontFileReader(in);
+ boolean supported = ttf.readFont(reader, null);
+ if (!supported) {
+ throw new IOException("Could not load TrueType font: " + fontFileURI);
+ }
+ if (ttf.isCFF()) {
+ throw new UnsupportedOperationException(
+ "OpenType fonts with CFF data are not supported, yet");
+ }
+ multiFont = new MultiByteFont();
+ multiFont.setResolver(this.resolver);
+ returnFont = multiFont;
+
+ returnFont.setFontName(ttf.getPostScriptName());
+ returnFont.setFullName(ttf.getFullName());
+ returnFont.setFamilyNames(ttf.getFamilyNames());
+ returnFont.setFontSubFamilyName(ttf.getSubFamilyName());
+ //multiFont.setTTCName(ttcName)
+ returnFont.setCapHeight(ttf.getCapHeight());
+ returnFont.setXHeight(ttf.getXHeight());
+ returnFont.setAscender(ttf.getLowerCaseAscent());
+ returnFont.setDescender(ttf.getLowerCaseDescent());
+ returnFont.setFontBBox(ttf.getFontBBox());
+ //returnFont.setFirstChar(ttf.getFirstChar();)
+ returnFont.setFlags(ttf.getFlags());
+ returnFont.setStemV(Integer.parseInt(ttf.getStemV())); //not used for TTF
+ returnFont.setItalicAngle(Integer.parseInt(ttf.getItalicAngle()));
+ returnFont.setMissingWidth(0);
+
+ multiFont.setCIDType(CIDFontType.CIDTYPE2);
+ int[] wx = ttf.getWidths();
+ multiFont.setWidthArray(wx);
+ List entries = ttf.getCMaps();
+ BFEntry[] bfentries = new BFEntry[entries.size()];
+ int pos = 0;
+ Iterator iter = ttf.getCMaps().listIterator();
+ while (iter.hasNext()) {
+ TTFCmapEntry ce = (TTFCmapEntry)iter.next();
+ bfentries[pos] = new BFEntry(ce.getUnicodeStart(), ce.getUnicodeEnd(),
+ ce.getGlyphStartIndex());
+ pos++;
+ }
+ multiFont.setBFEntries(bfentries);
+ copyKerning(ttf, true);
+ multiFont.setEmbedFileName(this.fontFileURI);
+ loaded = true;
+ }
+
+ /**
+ * Copy kerning information.
+ */
+ private void copyKerning(TTFFile ttf, boolean isCid) {
+
+ // Get kerning
+ Iterator iter;
+ if (isCid) {
+ iter = ttf.getKerning().keySet().iterator();
+ } else {
+ iter = ttf.getAnsiKerning().keySet().iterator();
+ }
+
+ while (iter.hasNext()) {
+ Integer kpx1 = (Integer)iter.next();
+
+ Map h2;
+ if (isCid) {
+ h2 = (Map)ttf.getKerning().get(kpx1);
+ } else {
+ h2 = (Map)ttf.getAnsiKerning().get(kpx1);
+ }
+ returnFont.putKerningEntry(kpx1, h2);
+ }
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java Wed Feb 13 04:03:30 2008
@@ -1,92 +1,92 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fonts.type1;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-
-import org.apache.fop.fonts.FontLoader;
-import org.apache.fop.fonts.FontResolver;
-import org.apache.fop.fonts.FontType;
-import org.apache.fop.fonts.SingleByteFont;
-
-/**
- * Loads a Type 1 font into memory directly from the original font file.
- */
-public class Type1FontLoader extends FontLoader {
-
- private PFMFile pfm;
- private SingleByteFont singleFont;
-
- /**
- * Constructs a new Type 1 font loader.
- * @param fontFileURI the URI to the PFB file of a Type 1 font
- * @param in the InputStream reading the PFM file of a Type 1 font
- * @param resolver the font resolver used to resolve URIs
- * @throws IOException In case of an I/O error
- */
- public Type1FontLoader(String fontFileURI, InputStream in, FontResolver resolver)
- throws IOException {
- super(fontFileURI, in, resolver);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void read() throws IOException {
- pfm = new PFMFile();
- pfm.load(in);
- singleFont = new SingleByteFont();
- singleFont.setFontType(FontType.TYPE1);
- if (pfm.getCharSet() >= 0 && pfm.getCharSet() <= 2) {
- singleFont.setEncoding(pfm.getCharSetName() + "Encoding");
- } else {
- log.warn("The PFM reports an unsupported encoding ("
- + pfm.getCharSetName() + "). The font may not work as expected.");
- singleFont.setEncoding("WinAnsiEncoding"); //Try fallback, no guarantees!
- }
- singleFont.setResolver(this.resolver);
- returnFont = singleFont;
- returnFont.setFontName(pfm.getPostscriptName());
- String fullName = pfm.getPostscriptName();
- fullName = fullName.replace('-', ' '); //Hack! Try to emulate full name
- returnFont.setFullName(fullName); //should be afm.getFullName()!!
- //TODO not accurate: we need FullName from the AFM file but we don't have an AFM parser
- Set names = new java.util.HashSet();
- names.add(pfm.getWindowsName()); //should be afm.getFamilyName()!!
- returnFont.setFamilyNames(names);
- returnFont.setCapHeight(pfm.getCapHeight());
- returnFont.setXHeight(pfm.getXHeight());
- returnFont.setAscender(pfm.getLowerCaseAscent());
- returnFont.setDescender(pfm.getLowerCaseDescent());
- returnFont.setFontBBox(pfm.getFontBBox());
- returnFont.setFirstChar(pfm.getFirstChar());
- returnFont.setLastChar(pfm.getLastChar());
- returnFont.setFlags(pfm.getFlags());
- returnFont.setStemV(pfm.getStemV());
- returnFont.setItalicAngle(pfm.getItalicAngle());
- returnFont.setMissingWidth(0);
- for (short i = pfm.getFirstChar(); i <= pfm.getLastChar(); i++) {
- singleFont.setWidth(i, pfm.getCharWidth(i));
- }
- singleFont.setEmbedFileName(this.fontFileURI);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fonts.type1;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
+import org.apache.fop.fonts.FontLoader;
+import org.apache.fop.fonts.FontResolver;
+import org.apache.fop.fonts.FontType;
+import org.apache.fop.fonts.SingleByteFont;
+
+/**
+ * Loads a Type 1 font into memory directly from the original font file.
+ */
+public class Type1FontLoader extends FontLoader {
+
+ private PFMFile pfm;
+ private SingleByteFont singleFont;
+
+ /**
+ * Constructs a new Type 1 font loader.
+ * @param fontFileURI the URI to the PFB file of a Type 1 font
+ * @param in the InputStream reading the PFM file of a Type 1 font
+ * @param resolver the font resolver used to resolve URIs
+ * @throws IOException In case of an I/O error
+ */
+ public Type1FontLoader(String fontFileURI, InputStream in, FontResolver resolver)
+ throws IOException {
+ super(fontFileURI, in, resolver);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void read() throws IOException {
+ pfm = new PFMFile();
+ pfm.load(in);
+ singleFont = new SingleByteFont();
+ singleFont.setFontType(FontType.TYPE1);
+ if (pfm.getCharSet() >= 0 && pfm.getCharSet() <= 2) {
+ singleFont.setEncoding(pfm.getCharSetName() + "Encoding");
+ } else {
+ log.warn("The PFM reports an unsupported encoding ("
+ + pfm.getCharSetName() + "). The font may not work as expected.");
+ singleFont.setEncoding("WinAnsiEncoding"); //Try fallback, no guarantees!
+ }
+ singleFont.setResolver(this.resolver);
+ returnFont = singleFont;
+ returnFont.setFontName(pfm.getPostscriptName());
+ String fullName = pfm.getPostscriptName();
+ fullName = fullName.replace('-', ' '); //Hack! Try to emulate full name
+ returnFont.setFullName(fullName); //should be afm.getFullName()!!
+ //TODO not accurate: we need FullName from the AFM file but we don't have an AFM parser
+ Set names = new java.util.HashSet();
+ names.add(pfm.getWindowsName()); //should be afm.getFamilyName()!!
+ returnFont.setFamilyNames(names);
+ returnFont.setCapHeight(pfm.getCapHeight());
+ returnFont.setXHeight(pfm.getXHeight());
+ returnFont.setAscender(pfm.getLowerCaseAscent());
+ returnFont.setDescender(pfm.getLowerCaseDescent());
+ returnFont.setFontBBox(pfm.getFontBBox());
+ returnFont.setFirstChar(pfm.getFirstChar());
+ returnFont.setLastChar(pfm.getLastChar());
+ returnFont.setFlags(pfm.getFlags());
+ returnFont.setStemV(pfm.getStemV());
+ returnFont.setItalicAngle(pfm.getItalicAngle());
+ returnFont.setMissingWidth(0);
+ for (short i = pfm.getFirstChar(); i <= pfm.getLastChar(); i++) {
+ singleFont.setWidth(i, pfm.getCharWidth(i));
+ }
+ singleFont.setEmbedFileName(this.fontFileURI);
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenation.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationException.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternConsumer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java?rev=627367&r1=627366&r2=627367&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java Wed Feb 13 04:03:30 2008
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.image;
-
-/**
- * Enhanced metafile image.
- * This supports loading a EMF image.
- *
- * @see AbstractFopImage
- * @see FopImage
- */
-public class EmfImage extends AbstractFopImage {
-
- /**
- * Create a bitmap image with the image data.
- *
- * @param imgInfo the image information
- */
- public EmfImage(FopImage.ImageInfo imgInfo) {
- super(imgInfo);
- }
-
- /**
- * Load the original EMF data.
- * This loads the original EMF data and reads the color space,
- * and icc profile if any.
- *
- * @return true if loaded false for any error
- */
- protected boolean loadOriginalData() {
- return loadDefaultOriginalData();
- }
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.image;
+
+/**
+ * Enhanced metafile image.
+ * This supports loading a EMF image.
+ *
+ * @see AbstractFopImage
+ * @see FopImage
+ */
+public class EmfImage extends AbstractFopImage {
+
+ /**
+ * Create a bitmap image with the image data.
+ *
+ * @param imgInfo the image information
+ */
+ public EmfImage(FopImage.ImageInfo imgInfo) {
+ super(imgInfo);
+ }
+
+ /**
+ * Load the original EMF data.
+ * This loads the original EMF data and reads the color space,
+ * and icc profile if any.
+ *
+ * @return true if loaded false for any error
+ */
+ protected boolean loadOriginalData() {
+ return loadDefaultOriginalData();
+ }
+}
+
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-CRLF
+native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/PNGImage.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/RegisterableImageProvider.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/TIFFImage.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 04:03:30 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org