diff -Nru libreoffice-3.6.2~rc2/debian/changelog libreoffice-3.6.2~rc2/debian/changelog --- libreoffice-3.6.2~rc2/debian/changelog 2012-10-25 03:42:12.000000000 +0900 +++ libreoffice-3.6.2~rc2/debian/changelog 2012-11-20 11:06:04.000000000 +0900 @@ -1,3 +1,12 @@ +libreoffice (1:3.6.2~rc2-0ubuntu4.1) quantal-proposed; urgency=low + + * cherry pick from upstream 3.6 branch Change-Id + I2e02156ffc30629476b80134ffb0b50e793f7ead (LP: #585910) + - improve rendering of the "faux bold" font on Impress + presentation + + -- Nobuto MURATA Tue, 20 Nov 2012 11:00:43 +0900 + libreoffice (1:3.6.2~rc2-0ubuntu4) quantal-proposed; urgency=low * update to unitymenus patch Change-Id diff -Nru libreoffice-3.6.2~rc2/debian/patches/improve-faux-bold-font.patch libreoffice-3.6.2~rc2/debian/patches/improve-faux-bold-font.patch --- libreoffice-3.6.2~rc2/debian/patches/improve-faux-bold-font.patch 1970-01-01 09:00:00.000000000 +0900 +++ libreoffice-3.6.2~rc2/debian/patches/improve-faux-bold-font.patch 2012-11-20 10:59:31.000000000 +0900 @@ -0,0 +1,31 @@ +From cad7a5814775adf458f8a490700fa5ef6b8f8638 Mon Sep 17 00:00:00 2001 +From: Flex Liu +Date: Fri, 26 Oct 2012 14:18:35 +0000 +Subject: Resolves: fdo#47432 Improve the "faux bold" in cairo canvas + +The "faux bold" make the bold font in Asian ugly & unacceptable, +Adjust & improve the "faux bold" to make the bold font better. + +Change-Id: I2e02156ffc30629476b80134ffb0b50e793f7ead +Signed-off-by: Jan Holesovsky +--- +--- a/canvas/source/cairo/cairo_textlayout.cxx ++++ b/canvas/source/cairo/cairo_textlayout.cxx +@@ -618,14 +618,15 @@ + if (rSysFontData.bFakeBold) + { + double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() ); +- int total_steps = 2 * ((int) (bold_dx + 0.5)); ++ int total_steps = 1 * ((int) (bold_dx + 0.5)); + + // loop to draw the text for every half pixel of displacement + for (int nSteps = 0; nSteps < total_steps; nSteps++) + { + for(int nGlyphIdx = 0; nGlyphIdx < (int) cairo_glyphs.size(); nGlyphIdx++) + { +- cairo_glyphs[nGlyphIdx].x += bold_dx * nSteps / total_steps; ++ cairo_glyphs[nGlyphIdx].x += (bold_dx * nSteps / total_steps) / 4; ++ cairo_glyphs[nGlyphIdx].y -= (bold_dx * nSteps / total_steps) / 4; + } + cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size()); + } diff -Nru libreoffice-3.6.2~rc2/debian/patches/series libreoffice-3.6.2~rc2/debian/patches/series --- libreoffice-3.6.2~rc2/debian/patches/series 2012-10-25 03:42:12.000000000 +0900 +++ libreoffice-3.6.2~rc2/debian/patches/series 2012-11-20 10:59:22.000000000 +0900 @@ -30,3 +30,4 @@ #fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff packagekit.diff unitymenus.diff +improve-faux-bold-font.patch