cvs commit: xml-fop/src/codegen code-point-mapping.xsl

2003-07-08 Thread pbwest 
pbwest  2003/07/08 04:49:07

  Modified:src/codegen Tag: FOP_0-20-0_Alt-Design
code-point-mapping.xsl
  Log:
  Modofoed existing licence to CDATA in a variable so that
  it can be inserted into the generated code.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.6.12.2  +59 -50xml-fop/src/codegen/code-point-mapping.xsl
  
  Index: code-point-mapping.xsl
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/code-point-mapping.xsl,v
  retrieving revision 1.6.12.1
  retrieving revision 1.6.12.2
  diff -u -r1.6.12.1 -r1.6.12.2
  --- code-point-mapping.xsl4 Jul 2003 03:17:26 -   1.6.12.1
  +++ code-point-mapping.xsl8 Jul 2003 11:49:07 -   1.6.12.2
  @@ -1,60 +1,69 @@
  - 
  +
   http://www.w3.org/1999/XSL/Transform";>
  +  
  +   
  +
 
 
   
 
  +
   package org.apache.fop.fonts;
   
   import java.util.Map;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/codegen code-point-mapping.xsl

2003-02-25 Thread jeremias 
jeremias2003/02/25 07:38:01

  Modified:src/codegen Tag: fop-0_20_2-maintain code-point-mapping.xsl
  Log:
  Added licence
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.6.10.2  +67 -16xml-fop/src/codegen/code-point-mapping.xsl
  
  Index: code-point-mapping.xsl
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/code-point-mapping.xsl,v
  retrieving revision 1.6.10.1
  retrieving revision 1.6.10.2
  diff -u -r1.6.10.1 -r1.6.10.2
  --- code-point-mapping.xsl11 Feb 2002 00:43:44 -  1.6.10.1
  +++ code-point-mapping.xsl25 Feb 2003 15:38:01 -  1.6.10.2
  @@ -1,3 +1,53 @@
  + 
   http://www.w3.org/1999/XSL/Transform";>
 
  @@ -6,6 +56,7 @@
   
 
   package org.apache.fop.render.pdf;
  +
   import java.util.Hashtable;
   
   public class CodePointMapping {
  @@ -16,10 +67,10 @@
   int nonLatin1 = 0;
   latin1Map = new char[256];
   for(int i = 0; i < table.length; i += 2) {
  -   if(table[i+1] < 256)
  -   latin1Map[table[i+1]] = (char) table[i];
  -   else
  -   ++nonLatin1;
  +if(table[i+1] < 256)
  +latin1Map[table[i+1]] = (char) table[i];
  +else
  +++nonLatin1;
   }
   characters = new char[nonLatin1];
   codepoints = new char[nonLatin1];
  @@ -27,17 +78,17 @@
   for(int i = 0; i < table.length; i += 2) {
   char c = (char) table[i+1];
   if(c >= 256) {
  -   ++top;
  -   for(int j = top - 1; j >= 0; --j) {
  -   if(j > 0 && characters[j-1] >= c) {
  -   characters[j] = characters[j-1];
  -   codepoints[j] = codepoints[j-1];
  -   } else {
  -   characters[j] = c;
  -   codepoints[j] = (char) table[i];
  -   break;
  -   }
  -   }
  +++top;
  +for(int j = top - 1; j >= 0; --j) {
  +if(j > 0 && characters[j-1] >= c) {
  +characters[j] = characters[j-1];
  +codepoints[j] = codepoints[j-1];
  +} else {
  +characters[j] = c;
  +codepoints[j] = (char) table[i];
  +break;
  +}
  +}
   }
   }
   }
  @@ -63,7 +114,7 @@
   
   private static Hashtable mappings;
   static {
  - mappings = new Hashtable();
  +mappings = new Hashtable();
   }
   public static CodePointMapping getMapping(String encoding) {
   CodePointMapping mapping = (CodePointMapping) mappings.get(encoding);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/codegen code-point-mapping.xsl foproperties.xml properties.xsl t1font-file.xsl ttffontfile.xsl

2002-09-17 Thread keiron 

keiron  2002/09/17 02:29:00

  Modified:src/codegen code-point-mapping.xsl foproperties.xml
properties.xsl t1font-file.xsl ttffontfile.xsl
  Log:
  updated to java2 collections
  
  Revision  ChangesPath
  1.8   +5 -3  xml-fop/src/codegen/code-point-mapping.xsl
  
  Index: code-point-mapping.xsl
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/code-point-mapping.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- code-point-mapping.xsl28 Jun 2002 07:52:53 -  1.7
  +++ code-point-mapping.xsl17 Sep 2002 09:28:59 -  1.8
  @@ -6,7 +6,9 @@
   
 
   package org.apache.fop.render.pdf;
  -import java.util.Hashtable;
  +import java.util.Map;
  +import java.util.HashMap;
  +import java.util.Collections;
   
   public class CodePointMapping {
   private char[] latin1Map;
  @@ -61,9 +63,9 @@
   }
   }
   
  -private static Hashtable mappings;
  +private static Map mappings;
   static {
  - mappings = new Hashtable();
  +mappings = Collections.synchronizedMap(new HashMap());
   }
   public static CodePointMapping getMapping(String encoding) {
   CodePointMapping mapping = (CodePointMapping) mappings.get(encoding);
  
  
  
  1.34  +11 -2 xml-fop/src/codegen/foproperties.xml
  
  Index: foproperties.xml
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/foproperties.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- foproperties.xml  23 Jul 2002 11:07:59 -  1.33
  +++ foproperties.xml  17 Sep 2002 09:28:59 -  1.34
  @@ -233,7 +233,6 @@
   auto
   fixed
   absolute
  -inherit
 
   auto
 
  @@ -1848,7 +1847,17 @@
 
   caption-side
   true
  -ToBeImplemented
  +Enum
  +  
  +before
  +after
  +start
  +end
  +top
  +bottom
  +left
  +right
  +  
   before
 
 
  
  
  
  1.17  +3 -3  xml-fop/src/codegen/properties.xsl
  
  Index: properties.xsl
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/properties.xsl,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- properties.xsl25 Jul 2002 09:32:26 -  1.16
  +++ properties.xsl17 Sep 2002 09:28:59 -  1.17
  @@ -56,9 +56,9 @@
   
   
   // Initialize hashtable of keywords
  -static Hashtable s_htKeywords;
  +static HashMap s_htKeywords;
   static {
  - s_htKeywords = new Hashtable();
  + s_htKeywords = new HashMap();
 
s_htKeywords.put("", "");
 
  @@ -207,7 +207,7 @@
   
   package org.apache.fop.fo.properties;
   
  -import java.util.Hashtable;
  +import java.util.HashMap;
   import org.apache.fop.datatypes.*;
   import org.apache.fop.fo.*;
   import org.apache.fop.apps.FOPException;
  
  
  
  1.4   +5 -5  xml-fop/src/codegen/t1font-file.xsl
  
  Index: t1font-file.xsl
  ===
  RCS file: /home/cvs/xml-fop/src/codegen/t1font-file.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- t1font-file.xsl   5 Feb 2001 08:35:25 -   1.3
  +++ t1font-file.xsl   17 Sep 2002 09:28:59 -  1.4
  @@ -27,7 +27,7 @@
   import java.io.InputStream;
   import java.io.FileInputStream;
   import java.io.BufferedInputStream;
  -import java.util.Hashtable;
  +import java.util.HashMap;
   
   public class  extends Font implements 
FontDescriptor {
   private final static String fontName = "";
  @@ -51,24 +51,24 @@
   private final static int firstChar = ;
   private final static int lastChar = ;
   private final static int[] width;
  -private final static Hashtable kerning=new Hashtable();
  +private final static HashMap kerning=new HashMap();
   
   static {
   width = new int[256];
   width[] = 
;
   
   
  -Hashtable tmptable;
  +HashMap tmptable;
   
   
  -tmptable=new Hashtable();
  +tmptable=new HashMap();
   tmptable.put(Glyphs.glyphToString(""), new 
Integer());
   kerning.put(Glyphs.glyphToString(""), 
tmptable);
   
   }
   
   public final boolean hasKerningInfo() {return kerning.isEmpty();}
  -public final java.util.Hashtable getKerningInfo() {return kerning;}
  +public final java.util.HashMap getKerningInfo() {return kerning;}
   public byte getSubType() {return org.apache.fop.pdf.PDFFont.TYPE1;}
   
   public boolean isEmbeddable() {
  
  
  
  1.2   +5 -5  xml-fop/src/codegen/ttffontfile.xsl
  
  Index: ttffontfile.xsl
  ===
  RCS file: /home/cvs