Attachment 82640 Details for Bug 9001 – ligature-selection-paint.patch

[patch] ligature-selection-paint.patch

lsp.patch (text/plain), 1.54 KB, created by Ed Catmur on 2013-07-18 23:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Catmur

Created: 2013-07-18 23:05:19 UTC

Size: 1.54 KB

patch

obsolete

>--- poppler/CharTypes.h	2006/11/13 00:15:38	1.1
>+++ poppler/CharTypes.h	2006/11/13 00:36:07
>@@ -20,5 +20,6 @@ typedef unsigned int CID;
> // - 16-bit CID
> // - Unicode
> typedef unsigned int CharCode;
>+#define CHARCODE_LIGATED 0xFFFFFFFF
> 
> #endif
>--- poppler/TextOutputDev.cc	2006/11/13 00:15:43	1.1
>+++ poppler/TextOutputDev.cc	2006/11/14 23:19:16
>@@ -2392,6 +2392,7 @@ void TextPage::addChar(GfxState *state, 
>     w1 /= uLen;
>     h1 /= uLen;
>     for (i = 0; i < uLen; ++i) {
>+      if (i > 0) c = CHARCODE_LIGATED;
>       curWord->addChar(state, curFont, x1 + i*w1, y1 + i*h1, w1, h1, charPos, nBytes, c, u[i], mat);
>     }
>   }
>@@ -4376,6 +4377,9 @@ void TextSelectionPainter::endPage()
>   for (int i = 0; i < selectionList->getLength(); i++) {
>     TextWordSelection *sel = (TextWordSelection *) selectionList->get(i);
>     int begin = sel->begin;
>+
>+    while (begin < sel->end && begin > 0 && word->charcode[begin] == CHARCODE_LIGATED)
>+      begin--;
> 
>     while (begin < sel->end) {
>       TextFontInfo *font = sel->word->font[begin];
>@@ -4400,8 +4404,9 @@ void TextSelectionPainter::endPage()
>       out->beginString(state, string);
> 
>       for (int i = begin; i < fEnd; i++) {
>-	out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0,
>-		      sel->word->charcode[i], 1, NULL, 0);
>+	if (sel->word->charcode[i] != CHARCODE_LIGATED)
>+	  out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0,
>+			sel->word->charcode[i], 1, NULL, 0);
>       }
>       out->endString(state);
>       delete string;

Actions: View | Splinter Review

Attachments on bug 9001: 7769 | 7795 | 16984 | 82508 | 82640 | 82641 | 82642 | 82753

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.