Changeset 239

Show
Ignore:
Timestamp:
06/27/08 06:39:00 (6 months ago)
Author:
tal
Message:
When calculating the applicable features, do *not* add in the defaults if a specific LangSysRecord has been found.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • packages/compositor/trunk/Lib/compositor/tables.py

    r54 r239  
    237237        # 4. get the list of applicable features 
    238238        applicableFeatures = set() 
    239         if defaultLangSys.FeatureCount: 
    240             applicableFeatures |= set(defaultLangSys.FeatureIndex) 
    241         if defaultLangSys.ReqFeatureIndex != 0xFFFF: 
    242             applicableFeatures.add(defaultLangSys.ReqFeatureIndex) 
    243         if specificLangSys is not None: 
     239        if specificLangSys is None: 
     240            if defaultLangSys.FeatureCount: 
     241                applicableFeatures |= set(defaultLangSys.FeatureIndex) 
     242            if defaultLangSys.ReqFeatureIndex != 0xFFFF: 
     243                applicableFeatures.add(defaultLangSys.ReqFeatureIndex) 
     244        else: 
    244245            if specificLangSys.FeatureCount: 
    245246                applicableFeatures |= set(specificLangSys.FeatureIndex)