← Back to branch summary

~ubuntu-branches/debian/wheezy/cuneiform/wheezy

« back to all changes in this revision

Viewing changes to cuneiform_src/Kern/pass2/src/p2_proc.c

  • Committer: Bazaar Package Importer
  • Author(s): Jakub Wilk
  • Date: 2011-04-30 13:16:24 UTC
  • mfrom: (1.1.3 upstream) (5.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110430131624-6yqf92183p6hshur
Tags: 1.1.0+dfsg-1
http://bugs.debian.org/596917
* Upload to unstable.
* New upstream release.
  + Drop patches: c-assert.diff, cuneiform.h-rename-*.diff,
    slovenian-slv.diff, soname.diff, swabytes.diff. All applied upstream.
  + Refresh the remaining patches.
  + Update *.install files.
  + Fix incorrect use of va_list (closes: #596917).
* Re-add c-assert.diff to fix another instance of custom assert() macro.
* Use stricter check level for dpkg-gensymbols.
* Bump standards version to 3.9.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cuneiform_src/Kern/pass2/src/p2_proc.c
656
656
                                                CSTR_rast firOut,int lang, int nNaklon);
657
657
                                int lang=p2globals.language;
658
658
 
659
 
                                if( lang==LANG_ENGLISH && p2globals.multy_language )
660
 
                                lang = LANG_RUSENG;
 
659
                                if( lang==PUMA_LANG_ENGLISH && p2globals.multy_language )
 
660
                                lang = PUMA_LANG_RUSENG;
661
661
                                // ������ ������-�����
662
662
                                for(lastNew=CSTR_GetNext(firstNew);lastNew;lastNew=CSTR_GetNext(firstNew))
663
663
                                CSTR_DelRaster(lastNew);
734
734
////////////////////////
735
735
// ���� �������� ��� ��� ?
736
736
static Bool IsLeoLanguage(uchar lang) {
737
 
        if (lang == LANG_RUSSIAN && !p2globals.langBul && !p2globals.langSer)
 
737
        if (lang == PUMA_LANG_RUSSIAN && !p2globals.langBul && !p2globals.langSer)
738
738
                return TRUE;
739
739
 
740
740
#ifdef _ENGLISH_LEO_
741
 
        if (lang == LANG_ENGLISH)
 
741
        if (lang == PUMA_LANG_ENGLISH)
742
742
                return TRUE;
743
743
#endif
744
744
 
752
752
        static char latin_str[] =
753
753
                        "QWERTYUIOPASDFGHJKLZXCVBNM0123456789qwertyuiopasdfghjklzxcvbnm#%+";
754
754
 
755
 
        if (lang == LANG_RUSSIAN) {
 
755
        if (lang == PUMA_LANG_RUSSIAN) {
756
756
                if (!p2globals.langBul && !p2globals.langSer && !p2globals.langUkr)
757
757
                        return TRUE;
758
758
 
763
763
        }
764
764
 
765
765
#ifdef _ENGLISH_LEO_
766
 
        if (lang == LANG_ENGLISH)
 
766
        if (lang == PUMA_LANG_ENGLISH)
767
767
                return TRUE;
768
768
 
769
769
        if (strchr(latin_str, let))
799
799
                                aa = (uchar *) (&dig_str[0]);
800
800
                                specBadLeo = specBadNon;
801
801
                                specVeryBadLeo = specBadNon;
802
 
                        } else if (p2globals.language == LANG_RUSSIAN) {
 
802
                        } else if (p2globals.language == PUMA_LANG_RUSSIAN) {
803
803
                                aa = (uchar *) (&alpha_str[0]);
804
804
                                specBadLeo = specBadRus;
805
805
                                specVeryBadLeo = specVeryBadRus;
1137
1137
                                // �������� lineFon
1138
1138
                                for(lastNew=CSTR_GetNext(firstNew);lastNew;lastNew=CSTR_GetNext(firstNew))
1139
1139
                                CSTR_DelRaster(lastNew);
1140
 
                                ret = RerecogLang( lineRaw,lineFon,&dup,dupend,(uchar)(lang==LANG_RUSSIAN?LANG_ENGLISH:LANG_RUSSIAN),&fontinfo,FALSE);
 
1140
                                ret = RerecogLang( lineRaw,lineFon,&dup,dupend,(uchar)(lang==PUMA_LANG_RUSSIAN?PUMA_LANG_ENGLISH:PUMA_LANG_RUSSIAN),&fontinfo,FALSE);
1141
1141
                                if(ret < 0)
1142
1142
                                break;
1143
1143
 
1388
1388
 
1389
1389
                                // discrim some let
1390
1390
                                if( (!specInfo || !specInfo->palkiLeo) &&
1391
 
                                                p2globals.language != LANG_RUSSIAN &&
 
1391
                                                p2globals.language != PUMA_LANG_RUSSIAN &&
1392
1392
                                                (
1393
1393
                                                                strchr("|!1li",res->Alt[0].Code) ||
1394
1394
                                                                res->Alt[0].Code == liga_i ||
1395
 
                                                                (language == LANG_TURKISH && // 30.05.2002 E.P.
 
1395
                                                                (language == PUMA_LANG_TURKISH && // 30.05.2002 E.P.
1396
1396
                                                                                (res->Alt[0].Code==i_sans_accent||
1397
1397
                                                                                                res->Alt[0].Code==II_dot_accent
1398
1398
                                                                                )
1417
1417
                                // ���� ���� ������������ � ����� -
1418
1418
                                // ( �� � ��� ����� ������ �� �����)
1419
1419
                                // ���� � ������������ ������ �����
1420
 
                                if( p2globals.language == LANG_RUSSIAN &&
 
1420
                                if( p2globals.language == PUMA_LANG_RUSSIAN &&
1421
1421
                                                strchr("��",res->Alt[0].Code)
1422
1422
                                )
1423
1423
                                return nAlt;
1446
1446
                                        // owerwrite special methods leo
1447
1447
                                        vers->Alt[ii].Method=REC_METHOD_LEO;
1448
1448
                                        ii++;
1449
 
                                        if( p2globals.language==LANG_RUSSIAN &&
 
1449
                                        if( p2globals.language==PUMA_LANG_RUSSIAN &&
1450
1450
                                                        res->Alt[i].Code >= 194 &&
1451
1451
                                                        !strchr("����",res->Alt[i].Code) ||
1452
 
                                                        p2globals.language != LANG_RUSSIAN &&
 
1452
                                                        p2globals.language != PUMA_LANG_RUSSIAN &&
1453
1453
                                                        strchr("CcOoPpSsVvWwXxZz",res->Alt[i].Code)
1454
1454
                                        )
1455
1455
                                        {
1525
1525
        int32_t language = p2globals.language;
1526
1526
 
1527
1527
        if (strchr(kuskiBroken, Code) || Code == liga_i || // 19.06.2001
1528
 
                        Code == liga_exm || language == LANG_LITHUANIAN && (Code == 'i'
 
1528
                        Code == liga_exm || language == PUMA_LANG_LITHUANIAN && (Code == 'i'
1529
1529
                        || Code == i_bottom_accent) ||
1530
1530
        // 30.05.2002 E.P.
1531
 
                        language == LANG_TURKISH && (Code == 'i' || Code == i_sans_accent
 
1531
                        language == PUMA_LANG_TURKISH && (Code == 'i' || Code == i_sans_accent
1532
1532
                                        || Code == 'I' || Code == II_dot_accent || Code
1533
1533
                                        == II_roof_accent || Code == i_roof_accent))
1534
1534
                return TRUE;
1562
1562
        int32_t porogFine;
1563
1563
 
1564
1564
        // Nick 10.07.2002
1565
 
        if (language == LANG_TURKISH)
 
1565
        if (language == PUMA_LANG_TURKISH)
1566
1566
                porogFine = TRSFI + 10;
1567
1567
        else
1568
1568
                porogFine = TRSFI;
1809
1809
 
1810
1810
        if (rect->right - rect->left < rect->bottom - rect->top) {
1811
1811
                // Nick 10.07.2002 - better for all lang ??? TO TEST
1812
 
                if (p2globals.language == LANG_TURKISH) {
 
1812
                if (p2globals.language == PUMA_LANG_TURKISH) {
1813
1813
                        if ((rect->right - rect->left) * 5 < (rect->bottom - rect->top) * 4)
1814
1814
                                return 0;
1815
1815
                } else
1823
1823
                        rect->right, 4, p2globals.nIncline);
1824
1824
        if (nOld <= 0) {
1825
1825
                // Nick 10.07.2002   - better for all ??? TO TEST
1826
 
                if (p2globals.language == LANG_TURKISH) {
 
1826
                if (p2globals.language == PUMA_LANG_TURKISH) {
1827
1827
                        firOld = firstNew;
1828
1828
                        lasOld = lastNew;
1829
1829
                } else
1860
1860
        uint16_t firConf = 0;
1861
1861
        uchar firCut = 0;
1862
1862
 
1863
 
        if (lang == LANG_ENGLISH && p2globals.multy_language)
1864
 
                lang = LANG_RUSENG;
 
1863
        if (lang == PUMA_LANG_ENGLISH && p2globals.multy_language)
 
1864
                lang = PUMA_LANG_RUSENG;
1865
1865
 
1866
1866
        //
1867
1867
        for (rst = first, nLet = 0, firstNew = NULL; rst && rst != last; rst
1986
1986
        int initClink = 0;
1987
1987
        int leftBou;
1988
1988
 
1989
 
        if (language == LANG_ENGLISH && p2globals.multy_language)
1990
 
                language = LANG_RUSENG;
 
1989
        if (language == PUMA_LANG_ENGLISH && p2globals.multy_language)
 
1990
                language = PUMA_LANG_RUSENG;
1991
1991
        //
1992
1992
        //
1993
1993
        for (rst = first, nLet = 0, firstNew = NULL; rst && rst != last;) {
2045
2045
 
2046
2046
                        CSTR_GetAttr(rst, &attr);
2047
2047
                        if (attr.clink >= TRSFINE && attr.col > rect.left + (rect.right
2048
 
                                        - rect.left) / 3 && (p2globals.language != LANG_TURKISH
 
2048
                                        - rect.left) / 3 && (p2globals.language != PUMA_LANG_TURKISH
2049
2049
                                        || attr.col > rect.left + (2* (rect .right-rect.left))/3
2050
2050
                                        )
2051
2051
 
2198
2198
        return 0;
2199
2199
#endif
2200
2200
 
2201
 
        if (language == LANG_ENGLISH && p2globals.multy_language)
2202
 
                language = LANG_RUSENG;
 
2201
        if (language == PUMA_LANG_ENGLISH && p2globals.multy_language)
 
2202
                language = PUMA_LANG_RUSENG;
2203
2203
 
2204
2204
        for (rst = first, goodBrok = 0, firstNew = NULL; rst && rst != last;) {
2205
2205
                if (!CSTR_GetAttr(rst, &attr) || !CSTR_GetCollection(rst, &verOld))
2451
2451
}
2452
2452
///////////////////
2453
2453
static Bool32 testUkrKryshki(uchar leoName, uchar fonName) {
2454
 
        if (p2globals.language == LANG_RUSSIAN && p2globals.langUkr) {
 
2454
        if (p2globals.language == PUMA_LANG_RUSSIAN && p2globals.langUkr) {
2455
2455
                if (fonName == 0xa9 && (leoName == 0xda || leoName == 0xc2 || leoName
2456
2456
                                == 0x69))
2457
2457
                        return FALSE;
2492
2492
 
2493
2493
        // �� �������� �� �����?
2494
2494
        if (nold == 1 && (palkiNew = TestPalka(fonStart, fonEnd, leoStart, leoEnd,
2495
 
                        (p2globals.language == LANG_RUSSIAN || p2globals.language
2496
 
                                        == LANG_ENGLISH ? 215 : 199))) == 1)
 
2495
                        (p2globals.language == PUMA_LANG_RUSSIAN || p2globals.language
 
2496
                                        == PUMA_LANG_ENGLISH ? 215 : 199))) == 1)
2497
2497
                return 0;
2498
2498
        // ����� - � ������� ?
2499
2499
        if (nold == 1 && TestNewDust(fonStart, fonEnd, leoStart, 22))