From 0438236a2c06687ddf27e63b2e020b3014dcc463 Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Fri, 29 Nov 2002 23:18:59 +0000 Subject: [PATCH] white-space and line-ending fixes git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195677 13f79535-47bb-0310-9956-ffa450edef68 --- src/codegen/Symbol.xml | 2 +- src/codegen/ZapfDingbats.xml | 2 +- src/codegen/charlist.xml | 32 +- src/codegen/enumgen.xsl | 32 +- src/codegen/font-file.xsl | 8 +- src/codegen/foproperties.xml | 396 +++++++++--------- src/codegen/properties.dtd | 66 +-- src/codegen/properties.xsl | 184 ++++---- src/codegen/propinc.xsl | 32 +- src/codegen/propmaker.xsl | 2 +- src/codegen/propmap.xsl | 2 +- src/codegen/t1font-file.xsl | 24 +- src/codegen/ttffontfile.xsl | 24 +- src/org/apache/fop/apps/Driver.java | 4 +- src/org/apache/fop/apps/PrintStarter.java | 4 +- src/org/apache/fop/area/Area.java | 6 +- src/org/apache/fop/area/AreaTree.java | 2 +- .../fop/area/CachedRenderPagesModel.java | 2 +- src/org/apache/fop/area/PageViewport.java | 2 +- src/org/apache/fop/area/RegionReference.java | 6 +- src/org/apache/fop/area/Trait.java | 2 +- .../apache/fop/fo/AbstractCharIterator.java | 2 +- src/org/apache/fop/fo/OneCharIterator.java | 2 +- src/org/apache/fop/fo/flow/Inline.java | 10 +- src/org/apache/fop/fo/flow/ListBlock.java | 4 +- src/org/apache/fop/fo/flow/ListItem.java | 2 +- src/org/apache/fop/fo/flow/TableCell.java | 4 +- src/org/apache/fop/fo/flow/TableRow.java | 4 +- .../fop/fo/pagination/LayoutMasterSet.java | 2 +- src/org/apache/fop/fonts/FontFileReader.java | 42 +- src/org/apache/fop/fonts/Glyphs.java | 20 +- src/org/apache/fop/fonts/TTFCmapEntry.java | 2 +- src/org/apache/fop/fonts/TTFDirTabEntry.java | 10 +- src/org/apache/fop/fonts/TTFFile.java | 76 ++-- src/org/apache/fop/fonts/TTFMtxEntry.java | 10 +- src/org/apache/fop/fonts/TTFSubSetFile.java | 10 +- .../apache/fop/fonts/apps/FontPostProcess.xsl | 30 +- .../fop/fonts/apps/FontPostProcessSort.xsl | 16 +- .../apache/fop/image/AbstractFopImage.java | 4 +- src/org/apache/fop/image/ImageFactory.java | 4 +- .../fop/layoutmgr/AbstractLayoutManager.java | 12 +- .../BlockContainerLayoutManager.java | 2 +- .../fop/layoutmgr/BlockLayoutManager.java | 2 +- .../fop/layoutmgr/FlowLayoutManager.java | 4 +- .../fop/layoutmgr/LineLayoutManager.java | 4 +- .../fop/layoutmgr/PageLayoutManager.java | 4 +- .../layoutmgr/StaticContentLayoutManager.java | 8 +- src/org/apache/fop/layoutmgr/list/Item.java | 2 +- .../list/ListBlockLayoutManager.java | 6 +- .../layoutmgr/list/ListItemLayoutManager.java | 2 +- src/org/apache/fop/layoutmgr/table/Row.java | 8 +- .../layoutmgr/table/TableLayoutManager.java | 2 +- src/org/apache/fop/mif/MIFHandler.java | 2 +- src/org/apache/fop/pdf/DCTFilter.java | 2 +- src/org/apache/fop/pdf/PDFColorSpace.java | 4 +- src/org/apache/fop/pdf/PDFDocument.java | 18 +- src/org/apache/fop/pdf/PDFFunction.java | 10 +- src/org/apache/fop/pdf/PDFICCStream.java | 10 +- src/org/apache/fop/pdf/PDFOutline.java | 2 +- src/org/apache/fop/pdf/PDFPage.java | 4 +- .../apache/fop/pdf/PDFResourceContext.java | 2 +- src/org/apache/fop/render/pdf/FontSetup.java | 2 +- .../apache/fop/render/pdf/FopPDFImage.java | 4 +- .../apache/fop/render/pdf/PDFRenderer.java | 10 +- .../apache/fop/render/pdf/fonts/LazyFont.java | 56 +-- .../apache/fop/rtf/renderer/RTFHandler.java | 4 +- src/org/apache/fop/svg/PDFANode.java | 2 +- .../apache/fop/svg/PDFDocumentGraphics2D.java | 4 +- src/org/apache/fop/svg/PDFGraphics2D.java | 12 +- src/org/apache/fop/viewer/GoToPageDialog.java | 2 +- src/org/apache/fop/viewer/PreviewDialog.java | 10 +- src/org/apache/fop/viewer/Translator.java | 12 +- 72 files changed, 658 insertions(+), 658 deletions(-) diff --git a/src/codegen/Symbol.xml b/src/codegen/Symbol.xml index 0776bee01..d3f52c363 100644 --- a/src/codegen/Symbol.xml +++ b/src/codegen/Symbol.xml @@ -2,7 +2,7 @@ Symbol Symbol SymbolEncoding - 1010 + 1010 520 1010 -293 diff --git a/src/codegen/ZapfDingbats.xml b/src/codegen/ZapfDingbats.xml index 25b61871c..39fbb7141 100644 --- a/src/codegen/ZapfDingbats.xml +++ b/src/codegen/ZapfDingbats.xml @@ -2,7 +2,7 @@ ZapfDingbats ZapfDingbats ZapfDingbatsEncoding - 820 + 820 426 820 -143 diff --git a/src/codegen/charlist.xml b/src/codegen/charlist.xml index 9c9854a7e..691d2f6d7 100644 --- a/src/codegen/charlist.xml +++ b/src/codegen/charlist.xml @@ -439,7 +439,7 @@ - @@ -592,21 +592,21 @@ public interface - extends .Enums + extends .Enums { public final static int = Constants.; @@ -69,18 +69,18 @@ package org.apache.fop.fo.properties; - - - - - + + + + + - - - public interface extends .Enums { } - - + + + public interface extends .Enums { } + + false @@ -100,7 +100,7 @@ package org.apache.fop.fo.properties; - + @@ -110,7 +110,7 @@ package org.apache.fop.fo.properties; public interface extends .Enums. { } - + diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl index 7167c5b54..f1bb6b160 100644 --- a/src/codegen/font-file.xsl +++ b/src/codegen/font-file.xsl @@ -11,7 +11,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - + @@ -43,7 +43,7 @@ public class extends Font { public String encoding() { return encoding; } - + public String fontName() { return fontName; } @@ -85,10 +85,10 @@ public class extends Font { public char mapChar(char c) { char d = mapping.mapChar(c); - if(d != 0) + if(d != 0) return d; else - return '#'; + return '#'; } } diff --git a/src/codegen/foproperties.xml b/src/codegen/foproperties.xml index e66297968..688862727 100644 --- a/src/codegen/foproperties.xml +++ b/src/codegen/foproperties.xml @@ -1,212 +1,212 @@ - - generic-color - GenericColor - ColorType - + + generic-color + GenericColor + ColorType + - - - generic-boolean - GenericBoolean - Enum - - true - false - - - - generic-keep - GenericKeep - Keep - - - within-page - Number - auto - - auto - always - - - - within-line - Number - auto - - auto - always - - - - within-column - Number - auto - - auto - always - - - - - - conditional-length-template - GenericCondLength - CondLength - - - length - Length - - - conditionality - Enum - - discard - retain - - - - - - padding-template - GenericCondPadding - GenericCondLength - false - 0pt - - - padding-template - GenericPadding - Length - false - 0pt + + + generic-boolean + GenericBoolean + Enum + + true + false + + + + generic-keep + GenericKeep + Keep + + + within-page + Number + auto + + auto + always + + + + within-line + Number + auto + + auto + always + + + + within-column + Number + auto + + auto + always + + + + + + conditional-length-template + GenericCondLength + CondLength + + + length + Length + + + conditionality + Enum + + discard + retain + + + + + + padding-template + GenericCondPadding + GenericCondLength + false + 0pt + + + padding-template + GenericPadding + Length + false + 0pt padding - + - - border-cond-width-template - GenericCondBorderWidth - 0.5pt - 1pt - 2pt - false - CondLength - - - length - Length - 0.5pt - 1pt - 2pt - medium - - - Enum - conditionality - - discard - retain - - - - + + border-cond-width-template + GenericCondBorderWidth + 0.5pt + 1pt + 2pt + false + CondLength + + + length + Length + 0.5pt + 1pt + 2pt + medium + + + Enum + conditionality + + discard + retain + + + + - - border-width-template - GenericBorderWidth - Length - 0.5pt - 1pt - 2pt - false - 0pt - border-width - - - border-style-template - GenericBorderStyle - false - Enum - - none - hidden - dotted - dashed - solid - double - groove - ridge - inset - outset - - none - border-style - - - break-template - GenericBreak - false - Enum - - auto - column - page - even-page - odd-page - - auto - - - generic-space - GenericSpace - false - Space - - - minimum - Length - 0pt - - - optimum - Length - 0pt - - - maximum - Length - 0pt - - - precedence - Number - - force - - 0 - - - conditionality - Enum - - discard - retain - - discard - - - + + border-width-template + GenericBorderWidth + Length + 0.5pt + 1pt + 2pt + false + 0pt + border-width + + + border-style-template + GenericBorderStyle + false + Enum + + none + hidden + dotted + dashed + solid + double + groove + ridge + inset + outset + + none + border-style + + + break-template + GenericBreak + false + Enum + + auto + column + page + even-page + odd-page + + auto + + + generic-space + GenericSpace + false + Space + + + minimum + Length + 0pt + + + optimum + Length + 0pt + + + maximum + Length + 0pt + + + precedence + Number + + force + + 0 + + + conditionality + Enum + + discard + retain + + discard + + + diff --git a/src/codegen/properties.dtd b/src/codegen/properties.dtd index a8a6a9d79..fdb1af6a2 100644 --- a/src/codegen/properties.dtd +++ b/src/codegen/properties.dtd @@ -3,15 +3,15 @@ DTD for foproperties.xml and svgproperties.xml --> - - + - + - + - + default?, enumeration?, datatype-conversion*, compound?, + keyword-equiv*, percent-ok?, auto-ok?, derive?, corresponding? ) > + +--> - + +--> - + +--> +--> - + +--> +--> - - + +--> - + - + - + - - - + + + protected String getDefaultFor() { - return ""; + return ""; } @@ -138,12 +138,12 @@ public Property make(PropertyList propertyList) throws FOPException { return make(propertyList, "", propertyList.getParentFObj()); - + if (m_defaultProp == null) { m_defaultProp=make(propertyList, "", propertyList.getParentFObj()); - } + } return m_defaultProp; - + } @@ -223,7 +223,7 @@ public class extends - + @@ -253,7 +253,7 @@ public class extends - + @@ -271,36 +271,36 @@ public class extends static private class SP_Maker - extends + extends implements . { - SP_Maker(String sPropName) { - super(sPropName); + SP_Maker(String sPropName) { + super(sPropName); } protected final static EnumProperty s_prop = new EnumProperty(); - + } final private static Property.Maker s_Maker = - new SP_Maker( - "."); + new SP_Maker( + "."); final private static Property.Maker s_Maker = - new ( - "."); - + new ( + "."); + static public Property.Maker maker(String propName) { - return new (propName); + return new (propName); } protected (String name) { - super(name); + super(name); m_shorthandMaker= getSubpropMaker(""); @@ -310,7 +310,7 @@ public class extends extends - + - if (subprop.equals("")) - return s_Maker; + if (subprop.equals("")) + return s_Maker; - return super.getSubpropMaker(subprop); + return super.getSubpropMaker(subprop); } protected Property setSubprop(Property baseProp, String subpropName, - Property subProp) { + Property subProp) { val = baseProp.get(); - // Do some type checking??? - // Check if one of our subproperties??? - val.setComponent(subpropName, subProp, false); - return baseProp; + // Do some type checking??? + // Check if one of our subproperties??? + val.setComponent(subpropName, subProp, false); + return baseProp; } public Property getSubpropValue(Property baseProp, String subpropName) { @@ -355,71 +355,71 @@ public class extends p = new (); - Property subProp; + p = new (); + Property subProp; - - - + + + - // set default for subprop - subProp = getSubpropMaker("").make(pList, - getDefaultFor(), fo); - p.setComponent("", subProp, true); + // set default for subprop + subProp = getSubpropMaker("").make(pList, + getDefaultFor(), fo); + p.setComponent("", subProp, true); - return new (p); + return new (p); } - - - + + + protected String getDefaultFor() { - return ""; + return ""; - return ""; + return ""; - return ""; - + return ""; + } /** Set the appropriate components when the "base" property is set. */ public Property convertProperty(Property p, PropertyList pList,FObj fo) - throws FOPException + throws FOPException { if (p instanceof ) return p; - if (! (p instanceof EnumProperty)) { - // delegate to the subprop maker to do conversions - p = m_shorthandMaker.convertProperty(p,pList,fo); + if (! (p instanceof EnumProperty)) { + // delegate to the subprop maker to do conversions + p = m_shorthandMaker.convertProperty(p,pList,fo); } - if (p != null) { - Property prop = makeCompound(pList, fo); + if (p != null) { + Property prop = makeCompound(pList, fo); - pval = prop.get(); + pval = prop.get(); - pval.setComponent("", p, false); + pval.setComponent("", p, false); return prop; } - else return null; + else return null; } @@ -433,7 +433,7 @@ public class extends public boolean inheritsSpecified() { - return true; + return true; } @@ -476,7 +476,7 @@ public class extends - // Make sure the property is set before calculating it! + // Make sure the property is set before calculating it! if (propertyList.getExplicitOrShorthand(sbExpr.toString()) == null) return p; sbExpr.setLength(0); @@ -497,7 +497,7 @@ public class extends subprop= getSubpropMaker(""). - make(propertyList, sbExpr.toString(), parentFO); + make(propertyList, sbExpr.toString(), parentFO); subprop= propertyList.getExplicitOrShorthand(sbExpr.toString()); @@ -517,7 +517,7 @@ public class extends - + if (p == null) { listprop = (ListProperty)propertyList.getExplicit(""); if (listprop != null) { @@ -572,12 +572,12 @@ public class extends - - - Conflict between subproperty datatypes: - != - - + + + Conflict between subproperty datatypes: + != + + diff --git a/src/codegen/propinc.xsl b/src/codegen/propinc.xsl index f83945b3d..e97d21cba 100644 --- a/src/codegen/propinc.xsl +++ b/src/codegen/propinc.xsl @@ -9,7 +9,7 @@ + $lcletters, $ucletters), substring($str, 2))"/> @@ -44,15 +44,15 @@ - - + + - No datatype found for property: + No datatype found for property: @@ -66,9 +66,9 @@ - - + + false @@ -83,18 +83,18 @@ - - + + - - - + + + - + false diff --git a/src/codegen/propmaker.xsl b/src/codegen/propmaker.xsl index 549693b14..88eb04d04 100644 --- a/src/codegen/propmaker.xsl +++ b/src/codegen/propmaker.xsl @@ -21,7 +21,7 @@ - + SVGStringProperty diff --git a/src/codegen/propmap.xsl b/src/codegen/propmap.xsl index 28074223e..ab8b1a7d4 100644 --- a/src/codegen/propmap.xsl +++ b/src/codegen/propmap.xsl @@ -98,7 +98,7 @@ public class PropertyMapping { - + diff --git a/src/codegen/t1font-file.xsl b/src/codegen/t1font-file.xsl index 7f306fb07..af385d17d 100644 --- a/src/codegen/t1font-file.xsl +++ b/src/codegen/t1font-file.xsl @@ -1,4 +1,4 @@ -