[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():