koco-cvs

[KoCo-CVS] [Commit] cjkcodecs/tools genmap_japanese.py

[Hye-Shik C. <pe...@us...>]

perky       03/05/14 01:15:22

  Modified:    tools    genmap_japanese.py
  Log:
  - Allocate new memory block if needed.
  - Block falling through to shiftjis for some characters.
  
  Revision  Changes    Path
  1.3       +8 -3      cjkcodecs/tools/genmap_japanese.py
  
  Index: genmap_japanese.py
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/tools/genmap_japanese.py,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- genmap_japanese.py	22 Apr 2003 21:04:36 -0000	1.2
  +++ genmap_japanese.py	14 May 2003 08:15:22 -0000	1.3
  @@ -26,7 +26,7 @@
   # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   # POSSIBILITY OF SUCH DAMAGE.
   #
  -# $Id: genmap_japanese.py,v 1.2 2003/04/22 21:04:36 perky Exp $
  +# $Id: genmap_japanese.py,v 1.3 2003/05/14 08:15:22 perky Exp $
   #
   
   from genmap_support import *
  @@ -118,9 +118,14 @@
   print "Generating CP932 Tweaks..."
   if difmap:
       print >> omap, "#define CP932_TWEAKUNIMAP(umap)",
  +    checked = {}
       for uni in difmap:
  -        print >> omap, "\\"
  -        print >> omap, "\t(umap)[0x%02x][0x%02x] = NOCHAR;" % (
  +        if not checked.has_key(uni >> 8):
  +            print >> omap, "\\\n\tif ((umap)[0x%02x] == NULL) " \
  +                "(umap)[0x%02x] = PyMem_Malloc(sizeof(DBCHAR) * 256);" % (
  +                    uni >> 8, uni >> 8),
  +            checked[uni >> 8] = True
  +        print >> omap, "\\\n\t(umap)[0x%02x][0x%02x] = DBCINV;" % (
                   uni >> 8, uni & 0xFF),
       print >> omap
   
  
  
  

[KoCo-CVS] [Commit] cjkcodecs/tools genmap_japanese.py

[Hye-Shik C. <pe...@us...>]

perky       03/05/26 06:51:19

  Modified:    tools    genmap_japanese.py
  Log:
  Touch cp932encmap correctly.
  
  Revision  Changes    Path
  1.6       +10 -4     cjkcodecs/tools/genmap_japanese.py
  
  Index: genmap_japanese.py
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/tools/genmap_japanese.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- genmap_japanese.py	17 May 2003 21:17:39 -0000	1.5
  +++ genmap_japanese.py	26 May 2003 13:51:19 -0000	1.6
  @@ -26,7 +26,7 @@
   # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   # POSSIBILITY OF SUCH DAMAGE.
   #
  -# $Id: genmap_japanese.py,v 1.5 2003/05/17 21:17:39 perky Exp $
  +# $Id: genmap_japanese.py,v 1.6 2003/05/26 13:51:19 perky Exp $
   #
   
   from genmap_support import *
  @@ -75,10 +75,16 @@
           sjisencmap[code >> 8][code & 0xff] = c1 << 8 | c2
   for c1, m in cp932decmap.items():
       for c2, code in m.items():
  -        if sjisencmap.has_key(c1) and sjisencmap[c1].has_key(c2) and \
  -                sjisencmap[c1][c2] != code:
  -            cp932encmap.setdefault(code >> 8, {})
  +        cp932encmap.setdefault(code >> 8, {})
  +        if not cp932encmap[code >> 8].has_key(code & 0xff):
               cp932encmap[code >> 8][code & 0xff] = c1 << 8 | c2
  +for c1, m in cp932encmap.items():
  +    for c2, code in m.items():
  +        if (sjisencmap.has_key(c1) and sjisencmap[c1].has_key(c2) and
  +                sjisencmap[c1][c2] == code):
  +            del cp932encmap[c1][c2]
  +            if not cp932encmap[c1]:
  +                del cp932encmap[c1]
   
   # Twinmap for both of JIS X 0208 (MSB unset) and JIS X 0212 (MSB set)
   for c1, m in jisx0208decmap.items():
  
  
  

[KoCo-CVS] [Commit] cjkcodecs/tools genmap_japanese.py

[Hye-Shik C. <pe...@us...>]

perky       03/07/07 01:13:49

  Modified:    tools    genmap_japanese.py
  Log:
  Fix wrong naming
  
  Revision  Changes    Path
  1.9       +4 -5      cjkcodecs/tools/genmap_japanese.py
  
  Index: genmap_japanese.py
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/tools/genmap_japanese.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- genmap_japanese.py	7 Jul 2003 04:47:24 -0000	1.8
  +++ genmap_japanese.py	7 Jul 2003 08:13:49 -0000	1.9
  @@ -26,7 +26,7 @@
   # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   # POSSIBILITY OF SUCH DAMAGE.
   #
  -# $Id: genmap_japanese.py,v 1.8 2003/07/07 04:47:24 perky Exp $
  +# $Id: genmap_japanese.py,v 1.9 2003/07/07 08:13:49 perky Exp $
   #
   
   from genmap_support import *
  @@ -276,9 +276,9 @@
   
   print "Generating JIS X 0213 unicode-pair decode map..."
   codebunch =[]
  -genmap_decode(codebunch, "jisx0213_pairdecmap", JISX0213_C1, JISX0213_C2,
  +genmap_decode(codebunch, "jisx0213_pair", JISX0213_C1, JISX0213_C2,
                 jisx0213pairdecmap, wide=1)
  -print_decmap(omap, codebunch, "jisx0213_pairdecmap",
  +print_decmap(omap, codebunch, "jisx0213_pair",
                jisx0213pairdecmap, wide=1)
   
   print "Generating JIS X 0213 unicode-pair encode map..."
  @@ -287,8 +287,7 @@
   print >> omap, "struct pair_encodemap jisx0213_pairencmap" \
                  "[JISX0213_ENCPAIRS] = {"
   for body, modifier, jis in jisx0213pairencmap:
  -    print >> omap, "    { 0x%04x, 0x%04x, 0x%04x }," % (
  -            body, modifier, jis)
  +    print >> omap, "    { 0x%04x%04x, 0x%04x }," % (body, modifier, jis)
   print >> omap, "};"
   
   print "\nDone!"