From c529bf7b0681ac95499894f010ae34af8c1af5f4 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Thu, 2 Aug 2012 01:12:52 +0200
Subject: [PATCH] Implement font sets.

---
 src/text/layout.cpp                           |  28 +++++++++--
 .../images/hb-fontsets-800-reference.png      | Bin 0 -> 11892 bytes
 tests/visual_tests/styles/hb-fontsets.xml     |  45 ++++++++++++++++++
 tests/visual_tests/test.py                    |   3 +-
 4 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 tests/visual_tests/images/hb-fontsets-800-reference.png
 create mode 100644 tests/visual_tests/styles/hb-fontsets.xml

diff --git a/src/text/layout.cpp b/src/text/layout.cpp
index 61439739f..eb089ee86 100644
--- a/src/text/layout.cpp
+++ b/src/text/layout.cpp
@@ -145,11 +145,12 @@ void text_layout::shape_text(text_line_ptr line)
     {
         face_set_ptr face_set = font_manager_.get_face_set(itr->format->face_name, itr->format->fontset);
         face_set->set_character_sizes(itr->format->text_size);
-        face_ptr face = *(face_set->begin()); //TODO: Implement font sets correctly
+        font_face_set::iterator face_itr = face_set->begin(), face_end = face_set->end();
+        for (; face_itr != face_end; face_itr++)
+        {
+        face_ptr face = *face_itr;
         text_shaping shaper(face->get_face()); //TODO: Make this more efficient by caching this object in font_face
 
-        line->update_max_char_height(face->get_char_height());
-
         shaper.process_text(text, itr->start, itr->end, itr->rtl == UBIDI_RTL, itr->script);
         hb_buffer_t *buffer = shaper.get_buffer();
 
@@ -158,6 +159,24 @@ void text_layout::shape_text(text_line_ptr line)
         hb_glyph_info_t *glyphs = hb_buffer_get_glyph_infos(buffer, NULL);
         hb_glyph_position_t *positions = hb_buffer_get_glyph_positions(buffer, NULL);
 
+        bool font_has_all_glyphs = true;
+        /* Check if all glyphs are valid. */
+        for (unsigned i=0; i<num_glyphs; i++)
+        {
+            if (!glyphs[i].codepoint)
+            {
+                font_has_all_glyphs = false;
+                break;
+            }
+        }
+        if (!font_has_all_glyphs)
+        {
+            //Try next font in fontset
+            continue;
+        }
+
+
+
         for (unsigned i=0; i<num_glyphs; i++)
         {
             glyph_info tmp;
@@ -174,6 +193,9 @@ void text_layout::shape_text(text_line_ptr line)
 
             line->add_glyph(tmp);
         }
+        line->update_max_char_height(face->get_char_height());
+        break; //When we reach this point the current font had all glyphs.
+        }
     }
 }
 
diff --git a/tests/visual_tests/images/hb-fontsets-800-reference.png b/tests/visual_tests/images/hb-fontsets-800-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6d716724aa0cd7de3967dcbb31c66216f3a0629
GIT binary patch
literal 11892
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%0DB^<GV`NKMfPoHXZL+$s
zB_rTqZTXNmQ1^K}Rg-h)i`P&@8f-`>wqd(*BQ@;0FAx6s#?@z(;mcj*PUoBgUeDZ$
zz!SIoA0mb^+P?xdP`{JjIn*?zNe8E{{Rra{C9RLDsr#LKgv4v-jb!u`+MCQadRALo
zl$*6|t{cGgL{KG5-63uWqgfAjQsY3%qq{p&V>a4U%+bAM&RY%F<wmfFE5iwxrw7+O
z851PTbd^w4x6XSGVm}N^X347CaK2iM7Mn_}io}L^3L0j(6m;VE<oWRw0EWotTlaj#
z%F3zr9^jjDb4Fju+)RT~d>Qg#-4^$naqY}qwkmdO-WgUysGU$ZV1xA(t_g2qh6mmM
zQS+nTK0gy)CRLKXhSMH+mV>mQg^GlrZ|r9w#2?%-cnV=5Z8j3`;p>}!M)F7cN@cvu
zb^C7KP%)_fOewlO8^8bS@*VAg21OUGbRNp^dX~Uhk6<rR8OrcHZB{mv*PPGFCq%YF
z`C9Hf0afEK=s|T7$vVmO^5acAE3JVaI3_<K31(JGWh&v#b$z47Z_&kWT%~~oeIuFG
z)N822hP02wo=$1Q(qy0R)VT$mv2BK@<Aa{np}am&#|{s|^V0&x2)bJ2jUtEX>>5pH
ziHwWEsqIWqqZ9>xBkMUDrt6O5#rligCjxfQLSz|~ZUo`ab4qwUC8u|bXXH&lZla<Z
z$qrVJc}U?KGfZ`*FjwccBQL*zh|9|_ma;o)ePfv<cLwqPqkj;+Uy(<wKO4OX*I!B;
zwqYp4`$s%thX80O+0(Ay*|5mCml+$#nP1*^4Ex=R85wrcuX8r_+uTUMkg<?yc((W=
z9I@YVO^$BTS)!IL2(XEp+4i*CYNd&{t4PZK5H%j|{HF4}ptxTDVvkBCU;EWv+$h_a
zcDBqZqzq6%Y)Xg8xfYcVcf5R-ve_DS!tDWmUe}8uoK-Ev$_0FGO0Nmd4tz@0U?VpH
z`5D`fVn@XhmHWk4(($6H!51%4<O^$4#{rNnK)SLHjgn1<<l5r{TCP~3vO2=k{$#`I
zlMgZ>!Rx`03l#UgH(K%Q)cuM*goC>-sDvA+XOvxC@3|4vb`y_zPGC1=^gC|`;h%!y
zK;OjND71frxpw^Z>?pnQ>>CECk?**ZzFq$0P^9d$IeJQE`&>Hc@mD`j$vB=j=b+q*
zQOZtvEWff36PtyFE>HomeU2huo}J-0z1)#>5&&%yp3<dWEVZDG-gRko@+kP5JrhA_
zToVk2f?Ebah9aV1Y`jD?y<vvmc7xXv^yD$V)SEE(-ei;hJ5l1guz5@4IS#n)?pI_c
z3taUg5;7Fu{fzy1AKcuTRctm=Tx|G0hiR`L93tZ>3*mh)ecpU^hVlN76}I$L&1<(Q
zX}fbKJ`8&PDDCC9-mp@^zdGJCLr8a&?IHxI;=1)?cn!9uYTsGS(?a1dsNybQ{(9=~
zc;&Gh8QvW4lV&j$yT5Ve^ddJlLur{{tJ!!jSer827umisETXVRs3iHK(;^&#eWgv!
z+{XBBT^38l41G+ge6EJ7z?}KA-w2(|v+~LJKmu4|77enqhMv3}S2e^;3db)6qP0!$
z-RA=j!3GvZ?LBL0#}drL3=dkMh2H+1RL<ZxGOC%UgMtj5L&r+)Ci@(b#_7%KUPE;J
zz_v7^aDgRUKEK{u&!~NoQ41kwVLwupYUI*F8yC_pkMY#3U#7Tq74)OPB`i;f2bMy9
z#Q@8g`S6)+d*TEw6thMPy|KoZ58y;i?pwZm**e2&o0LR7Bi`DK<s8KVJmlv*ezkY+
z3RT<`w<AP5oD_=%U?<7-0ZSO@PLsuwO#?LmM&V=(OyybNhtm;vGn3spD3yi46Br49
zKH2n`GrFY806kVmG_DL}Ww}dG(xPCL%F4&XK8@;`PsD%Yz(90CHHnNFeAZjn<`D@J
zcA1-*c}48Q`po&0cl#PRDe`w|IpE9v8ELzmL&zd+VusIhihWk`<#CJvxDET{DFW}a
zNprF}DS!9LS`MP3h^6=iC`MJg_|p_UWw2=aNerW&p`qQI_mJS!7|4bAz}qHB-LLh8
zR`M{N7DI#LjUspWDXk-)yh7N}LTi;KAa0;Dqd8ZO4oLiqW;X@00*`&Bc*+!mkv4Ds
z3@LF<zAI9=-R%ya`FhS>{lo2`TX}d$ytwB9AnQ?%^SQ9IU({J7mXj^roRuIl>PnDv
zKL8rn<hK)O{r58$XI^C$Vd%4zh?w5EX`mg>7i8l4m38;zK#c7q_0H!oCZ-(|RDHdZ
zo~h?3d>ZNlD)nyGtLI~2g4RSz%~y@U2wiPu%AUri=hn&^mQ!m6aN2o_fL)6#NPYu4
zz_ZV4W#2~r{aGA|i3p`<yZovbv^Mm_daBrdnNTTmc1F}_={|<y3{5_61aErjt|Mf~
zcB<NTpvDO>?^Wf!`$dqS9R#3#WVlNNBKxv4lKGNmMMwX@q%fu+W5D#`v=5yC<k4Wq
z60lUk(!HlScSeA;;q)M^3G`MuAFfA{klZ;b(@Il@5Ni6%zh*St^JcvoA*Rf*$`PlL
ze3cKU>ykMWE+G2YZ`aY-z6{Va`}y~>{3WJt-*4ORWeMBs;2)e}8MZBbr*V*#!Y-U@
zT+S=dU^m*vX8vlZ#&NRB;>_P*dI4p>Lr{a4XUf5->Ygk!ZJNrG@ZL^$=MZ^wL{r#L
zpzq+4<a+$VV!{8*3ICm-Rrzgz*5=Q1!tlb*Gmo8`PSq7Jn&rG9mNv$KU+<Ov&Pjtu
zFHS9H)Vq4Ro4;oI+hSAz+C3wgB-=Kvh$uT%jbwj^N!6khuB=!7rvL0n#B@eo{out#
zqFhFxAd?m$42~2<(?CHXIv38VkQf{1q}A&T8$ImD$VEecdLIoWACNZA2HeL;9YS&k
zd^0@9ux`cx(>N8Zag}e6)!2^&Ckj&JFAp_1pt5ZP=J=#No{5>}Be`$Oy**z!Lhvx>
z<WJcf-}jij#R?alw7N(p0J7kq@7B|q)t^U`q4z-NagWWPpI`0E?GurDl`ASak5ee*
ztIz4~S<eY~XO=!0cG@VdWAre+Icj|D1(>VT965;{?qMpJSm~=yx4yqB1Sw-2BQkP`
z-gDtBVf^GvTBi=U4{u<BM}h)v#wVGHAuFC80x`h8_`BU>5yT9|7uIE&B%0Qv-RTiJ
z6V`M<c^&~(C2i7wZ&n=;u+8CC*w9>HjPq=xg74AAgd{F_WW$<Yu6XZ!0NJU1<#Z6B
z9E;EI=u@5dMKoj&Rhg&-++~G(Og{_b?Dd}a*MA`qy=xUi#Tx|#z+K#VywkX;ckRl#
zvihHqSn}!-y9i2m;pp>;6;0f8XP7q@P{G%10TB{G^%gManR@v2oLkR*+}wTLvt%cR
zSq({&uHOx7pwz_OWMCKODScf4zwmK6tFf~PQK*r4J*EDPvLJO<p1&S<E)b}^CgEEl
zX79M{YJP^JP3($J_bAf$)vX80kRflGL=ym0w<@#g$Lw2OwW#7!)uTzLDvpK&uSbbv
z<=4x&8~QxScUa-4*r^2ZoH!Kzf-u+8C(yL{{K3NwF?rS}mvF*cI}0I9xV*1lrKFAv
z!6+Y)A;rc}t26c1l{ksIo@I`nva`y&;;WA0SiRC;5`q*cHuLtZ&>Kw^v{clNWlEr@
z$PWhd5W;-hv-=4NkMMe<8!dI;CMVNKWchEOeXQ&Rgi`*-QwRl$pHi6`%Sd50l&gRX
zTRLUib!#JqXN_8DAgV}C&?=HpU)y*Q=!p->BB_O;szAnBk>5T02b^=unA2o?f$5D5
z1PfK6W>$}WygOkzqVb}qdF>a%)I_DHloBouveHAK7mR%eqgqrV?u+lTu)_VWZ2O18
zwEPGi3i<Kjp?$B=bqiCg$MbHh@N`-z>#YdL-(Mdz(Hdp=a{*3MHI;YkvGJqbVn!>i
zU<_bY4HJI@xsAQ2l>%cL53onoI_#``4|2n51t_ueWi(zuPMS_kn(-e4gmI9~MV^!>
z4;hL~1zD`J3Mjh>pkd0zA+>xN=4a=D5>~m%5yu1q25K3fSGY2w;=KPc0WYF3bFRo}
z{>ivbB7|A*0>v+IPgTjnvc7Bw&0j)pzq;`L1CJM@40f6RsN4*4Y+OU{?$^9=Y1JyG
zwya@K+cvIqo;BEI=n8}A$i#!$L>eU8+ttMZ*;2ALQ08MjRnT*ALysS_d+7s`dnWDV
zjo|3U@{a@sYjC;x9!ih3;erK!5%!<E<%0@WUb}Gz>Biln4CgrL^Zsg~BpKj*5^Taj
z35k3!5BZa%JvzJ=TJL~fEgHw%1B&C`E2FWtxJ*eu^!9+xpfdaE>aM~)SRGAeUjANa
z7bmCzX<I`Dh+G6YwxAwwPB5sKRE2^tjAI@pIdWmk&8NyP0B)zJ>0%pKvc%nO#(<6t
zNk9x!ScNc%R-A0tjA)1xG$B|M6&mIY<F$2*`{Z<hYySH*N$O(1z3tr<Ku<+B{6Q*q
z^R7XJfWRO@2l!Q9`rh3j-Lm{biwuupmEDzd7w=fL{9m`M=}7zt!Cy!K%2JQ7Ina;Y
zRAE8&1zxoail-ng(F$TeR+3_R2@UA=GT`?A^`oMTAeU8yf>zO4Kp@T_o@(Sv2_6tv
zhW1y{692uxdLleC@OVFc?{-i&?8a$G&x9XyO1*kH_dkovcU}Bub9}h(^FK=)ZExgx
zCPl@pdzUJXE?yo2bk5Wim}k-czr|SkxxJnTZ8dwNTd~r|;m-&V{2kCmzP@8C>=rpP
z>597gXw#o)TF)wixIpoR(+}T{u|G|4N66Y#ZLy^HVpWd-|Kc14+$R(OxL}VDchon(
zFRtrSbO4y+LD{gr07RgVu7sfVP>@A>=KdrtiZAy$Pe+^3HYX%u9Egar)N$a63vhnF
z+t2pYhhePv%bVRW5S?-}$tLwMM$YbfZ#YR7lxQP!Hvgg9{m?WO1Wk?GTjOs`5LD5h
z#m>U+Ptjs?6Nf;kdX3`%LOx0&lm!|E1Y>keo{8EI8(?O<m-I22wiBh)GG>PJDFXpY
zC)9idt={+R`v>BjIU7F;aN#NTU5FOqzIp4DQkIv%j#-hM)FUo<{w$LaG*L?iz^q(w
zTafSjq-|CPj(sYD7x8y4aID1820&S5CnB&DzSb1N|AO$yv##6-yB3eTmsK_}ghkvP
zDb|1B4g~E<<U>a3!xzSn8_9SqqVxQfhtRdzvqABvLW<322C=7!E~%GCs;t%AJI>vm
zNc?xOvu4@oxnZ+AY0HHG)rdc07q+vwqmiBr^k|w9kqX8qzd!Ny2-y~gAjQc12BrXo
zsSu=?Pg^3pgjWeDz;}~&dC|jkvM1=loM7$HTs>=wAk|8%?-$&`{gQD`)94J2B%hHE
zPSB<V!9W(2KKv~=+!ReGXw!S;RP8RH{^98Pg1FqbrND37pPsTKaHbMea(#hXQmVN7
z@`Uvs7z3P-{0}^cK=+=)(m}L1?wQmNivGQ$o@(WC;L{!qY^%#CiqUoe%5Wo<n2^^e
z{~x?S-gaY`7HhMYKd8w>poc#@wPyayVFT$s(+mP!x%nC3UVGq<h`IyNmqP5980bwC
zdqAoK!y$Qlwkb`(v@w~#tiI#$m`t#r?oSr{obLMV>N0>h!sF(FEr!i6U9HF>z~*`c
zRNt=aOp^@PpG*Y2J=g@$+nM;8N%~jI$zrUu^YvH1+e-qCagHgHUjD?D0Wly6yJ!0k
z5xM+#hL*u#5FL;rJ65o1QSBL>esZ7p-<u?uRGyCUYK!*ZuD#OXzD&vK*1c^}AQa`|
zPL|VLdVy?+IMEmP1bLLwpCOTUIx0Y*AFkl4ZTk5Br2wqr;?;JVG6IdOH;H(JChHTa
zokL*T^&N;MM#nz+t2{+8^I2j&b<~#qpYCrr5uO%mWNdmr`_=V+`SscBJoVAdC&y%;
z`7qVOgYVMcoEw%t=Hm2C{{d^F;JD3WO~)OWKU0<^fXvzelTf^Flw7vg7Uxjb@a+^m
z?b?o#iio7<uxoD0+GL|hP3a?ix_iGkuD=ZgyARAV>%j6OEkl2hR+GNc)0Hsbdz|`Q
zQ@fwOvYDsvX7t(usV}G77|I3s=FXCSh|~VxC0s|t?v%q8!Ebld-YoFQ(->;C82G;0
zAB)Vcm;GAU*>iYQ*?HYTp!v5faVg0>6*QBS<-WAE^45dyLm;1_fhK_)L@phH$WN(G
z6{;R2TgFr-meP#@G$*zaa6o2$!^e!A(6IUUeJ_=H1~?@av9+KlPrvQ5=}S#fcz3yA
zw)3PH|M&oe7;!Ri7zIXSh8|0CE<14V+K*oT`w`}(P;Ti0I1APybHk@<EA7LEfonOk
z-6(NWU2InOx42MX9SCjOgVujH2@WzyK4V779WCR`)m_lE3Xd=Usvg}1&_Mkt5cpc6
zz;kStyln2fR!}o=tNO5MA($Q{;gb*ECqNOrJ5ujzNu2W|OuDV?jA)kYWLjT$0ES1(
zKDZR(WG}V}cyAMbN9NH0DeV5C*M96Zf7O5fQtPW@B4+yqK0?c}qWIQ2#2$~)UcW*H
zGXN1t?-pfGHuajkO$r>9p@YJ{;csBR)eQtbZ6Wxc&`$zB+6#z=OAj<riEm?u@M!Pu
zcmNG=VR~=XZ;*y{p3UU`bf9&hL0ooS>gIflw+^-a%U}E&Z;ROmzSk{sHH^X}x%-ur
z|H<LX90>cC_xbP(6!}zi&?E9*U399%c0D)AkDA$k=rm7_m9d?&MmR@%zgd{aszsyM
z77CzCA@@O<vni5$Gml8tZKtO9BCr<Ba7u={4~s0c&%h;F`cFM^zJKW)F3m$b8{-3)
zHBeDSY&>k#%&fz?L$Rk0VpeVG?hoLKJ@O;8co(^5cRJ0twlGMdFhy?2iU#1XY|bN7
z2*8!vwUrLK_Tm%8GSJrR%FP+9wJqfd@6ATQwY3k^nAAFxxOmE14^SM+OJFZVfZ|e}
zRlx3=J2%m^-Pm(nvZ$NoTC7*vn-?pUI;Gg+(0|$3@flZ}dYUM99-HI?v@v^fPA1%+
zO$aN99x&+q1j6||urN}ybLiaNbc@(?(I3Bq;kfBqVENUh#Kx}_wXjC!hV=u4$~0Z=
zeTopf5v+~A*`%Z4`8!XOEeIQw;e2jKeJ;PCV$|UuG+?}2-l$K-={kh+ZsEPjO#pV5
z!C$rYYlmytJh{&JZpoGv4(IwDPSc+J7-q?jF-+7?6V*T$t@Xd2_&Qfe$lX{ZX6K)j
zWQ^}?&nI?)z`e2XyB5nX(tT`7Mhoc<<X9?oX2eK~%*{x}a!QOHmk60e8&k)bwfGif
zem*e^k10NNo#%FpYUkN=K3=|WG?8h~37%<vLK^sIPdj5cxBTjsJ{nIEinkFQyl`Qs
zDd8>eb>R`e`~eL@5<QDA6Y@dP;V@w|Zj5XK#7c52zm^@xo*{Wh%zLKj{P3TgMk7KS
zZq!!t)xQ@+(1G+P^+=^16)~=XxYr#nvDYOX{jq@xoiQ=IiE>lhnSR@q8Nx78liAGT
zvRT0Uw_5Ftv%1aNN^|`6CCj&V0#?Z%-nG)FIaWpZo9|2jA1&j4Cy8^=TY*qb*>|)z
z?-J{<^<h08^z)Gtkmg?IWni<Lvu<de2mR_2T+h&&)wp3FU*Z0_6ZIR*rYJi1a#5F}
zdfK_E0FA|b8Xo*3L1?z*2OdbSnXJe<>E)zv4w4ylWvsAMn}Qp4sYpqMLW!a0DIK&(
zSL9MLo%s)ion!%?`Z;;h4kqrx)(F5LF8u1GR~tTG2(SO12{(Jk=Oc;cW7NK#HW?EA
z)0&2v6onlgA?OM=Wm+9+jM#bf9uUX?+SwK6U^*^}xuI#A*|$*FBDg$8nLS(VVlp+s
z7P=yJ*^%z}aIFw+*3^J<x`66F(dvPmOc~N@#PN1alSw(Uvx+@}uBVJ5d%g+FpZc5x
zI?puLrl>?=UR>mgd}2$h7;Nr{hUzZ@Vn3Mu+NpjGZLbYu6pp;XXD*zmItEC&L@;z+
z9I2$ROxtz(as@{k-{PfIkqg=H#X^xvo#p6DHZehVbUD{YlI{oD@r_kH`|Nl(0;VZ%
zog{G?f5qdOoUj{a#Z|^|{&sZD_ktudRF4O#xA@Ppl@}z!H`nu`2+VZS6nGiB`{nQ5
z*`8iggnvvy>YIvqMy*{LBCo)7@mgboH~7w&*rv~k`L8@ug5&GQPDbJSoapyFiDJ_(
zZ7nV3tI2pfC-8*D<*g{-L7G`}k$lQ=Qz#@_pcH6RSQbj^^PF|Ck2Cmt(VuwoF})-1
z#l7*4o~0$N2kVA~!0sr{SU|iO+*7ND?(BiqkN5ggKXf&#+eR#MrQ6m2?2f5NMz(KM
z?|3IIZ8s1;DMglbgRq}mCA)s2Eh6Y>`V86Hs&p*-qN6ZMn(m>a{JGuQq4A1W@dm@X
zXC*VG>qfQDXiIuav3^+}b;U!Fd79Lj4)-3@LHU~Tk8*>*BU9I}4iO!sJ&wcKAyZ>5
zjM_{pagf}%!M-H?L;P-8PBEmTOKDB$OgNv@-W;DYrZRs(r!$RDfDNw8f||;XVI}#F
zmYYkHt`sFJ0uJIOpp*moxq4+#`K@m~a*`j<=doVxJ>u*!(-gNUjq?>l?ypUBrw3;3
z8;v%tvKON)9<$G06}F4ZfGuZj<bL8l(6FDM*}K?o#X&LD6`!_UNb`>T<j_(fM~C}*
z3b259B0DN&!@CEa>Sjfe$M*QAKOV1MD(Qvf#@tBMJVSH7f<bSuJ~g#qah{qv+GsTy
zAzs`Ml`O|>>OLMz;MjBFrLZb4#i`CJMJpt>u(J;R0rGPZH<T`>h=X%aa%=@VAh&bO
z2eGALR$}m>mhvxKr`3-0TFQkP2&?M!Ub+{(UUZ$<Guzu}+F2W8DE4<#5hg^)DlKC@
zG5BMj|1G*(eEsR40rAn2v(eA%_qvn#gH{bZbiIK$IJr3I2W0fqP4s3Ar;`n37CFB4
zD5ySC%p9V9MJrZgInH5uabI_#=>7ipyIB(_#qEW%dN<@-`i~EvXS`W?>(3cT_tBRI
z`MoGfnE{buK|pZJhQ`~~8_QMk1&wNXBD^knfQ`!hte&WSW6d`JuiXEN@zQ`xLh-md
zYbYO2#=9I#A>tuB8yug88JKh`G;>gD*GpUiXfZQ2t;BNtsD#%T#JD^i{{hV+#Cdm0
zx{e9;51Tu{3cnWJUB4F8U{>6bpvW@2yZy^g-4(z0J16YAs`@zuw;_Y^(1uQI9{WHl
zO^8JmHM2;%$%C3X_m;hQz`{$gXTFlQBLkZ;COZ511D~Y@u2IuQKYz@ZC$#bnL^^sG
zd)I*YLnPyl@!~Kwb11b~slrmqycWJIjQy?iEqUwGjh!K$*cjr|21;dIMecYGp=4K|
zTXYhAe)RGrWfu@}GE;N0zq5tZ!TRTHTawB`)DA7563W@hjj`+EVw6AaYI-=^atB1G
zcdSA1*9|0-=oco}ccDPjF-_ZlDHZBL?WK<n0LTn?M$xn7#Fum+%z3~15G;Miv@3rB
z&1;-X%*r*%r(p)I+XTYGCM!$=wg3xjFda*3)+XPg359&ka02`D^{d(n%j{&nl2Hpp
zdv2ym+b6F>$ju_*QABA)4!JmJc(=?=PYzDhCHb{n7P%y1tu&B#!@MuL|2%YxiS=;Z
zP&f7##VsRWX;#`DpEcsR;F{e*gm2}J838~{+>d3-aLS_X^0hk$n<fg2m>UaXQ+V3J
z8d?&5?eV~QD7%kVo|)vkgC=(8Tsni!O5BLlGCdU5@9DVKI=S55G+uNxXcw85SE`t1
z_744E-F38Ua03xqu2|)pGP{~3aaJCI+cDTjzxok)x{D^dyXoNNqupxn6>BScC~9!+
zXzWBpL>^(kV~BMv|0{!Nlpk@rq>DUmAb!`?Sp8#4J7~M5nQ=j+RaitZue7oJ*wY#v
zTpe>pWTvLPF@hfI>#W|ReYJo^rY#4Pxd~pXnHVS7wbjf|DS1My=`O%)EZ$s~>ufM9
zkI|<NY<b|!?(Fp8eh?28reC`u*HRskcgq;U(o*QGE0?2}VKb%2$*lS0&zqK5MLUvI
z6VVm#itZdHctr776>SoGbULY-wP}Z<s6*o_C~oPSrtt@bw{pY2Ay<kW-8p$-=pD|H
zjnM%6(N9l-!y8aO<T9(zZxy+Ip(TmkkR}(12yb<n*_y89p<&j>Dss{Ny$dV}zG+8h
z(7NYuGkd7d4Rxut&asgC2mRvDx9qJ`dlgsIuhHes?~l;Z4Y?+`@G6Sr3jd97m@+D}
ze8hoVeiox28spfR9FXLIyq};US@QLooRoim3cq}Wq9yWJp#_#H8`&nC&i*EqZYi^R
z@WNPYZ{l)?7EjOafi_amI$V>Kgch`QF0RsSD;KbqvoSReH`B!Z)#!A^3Dq0G1m5jS
zL7ss(B9j&2!l}8D64T<mm^qKC0(9&fr-zh@vTEp!W?=|i=s$1b{^zaZ|0h-Dkn47t
W=Ou4t@ru*eu~if_<jZ6&g8vt5gLNeU

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/styles/hb-fontsets.xml b/tests/visual_tests/styles/hb-fontsets.xml
new file mode 100644
index 000000000..995dfbf20
--- /dev/null
+++ b/tests/visual_tests/styles/hb-fontsets.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Map>
+<Map background-color="white" srs="+proj=latlong +datum=WGS84">
+    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+            <StyleName>My Style</StyleName>
+            <Datasource>
+                <Parameter name="type">osm</Parameter>
+                <Parameter name="file">../data/points.osm</Parameter>
+            </Datasource>
+    </Layer>
+
+    <FontSet name="dejavu-first">
+        <Font face-name="DejaVu Sans Book" />
+        <Font face-name="Khmer OS Regular" />
+    </FontSet>
+
+    <FontSet name="khmeros-first">
+        <Font face-name="Khmer OS Regular" />
+        <Font face-name="DejaVu Sans Book" />
+    </FontSet>
+
+
+    <Style name="My Style">
+        <Rule>
+            <Filter>[nr] = "2"</Filter>
+            <TextSymbolizer face-name="Khmer OS Regular" size="36" placement="point" dy="-16">"A:ស្ត្រី"</TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"Khmer OS Regular"</TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>[nr] = "4"</Filter>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"B:ស្ត្រី"</TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"DejaVu Sans Book"</TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>[nr] = "6"</Filter>
+            <TextSymbolizer fontset-name="dejavu-first" size="36" placement="point" dy="-16">"C:ស្ត្រី"</TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: DejaVu first"</TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>[nr] = "8"</Filter>
+            <TextSymbolizer fontset-name="khmeros-first" size="36" placement="point" dy="-16">"D:ស្ត្រី"</TextSymbolizer>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: Khmer OS first"</TextSymbolizer>
+        </Rule>
+    </Style>
+</Map>
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index ab9190a90..2eb01a81f 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -46,7 +46,8 @@ files = [
     {'name': "jalign-auto", 'sizes': [(200, 200)]},
     {'name': "line-offset", 'sizes':[(900, 250)],
         'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
-    {'name': "orientation", 'sizes': [(800, 200)]}
+    {'name': "orientation", 'sizes': [(800, 200)]},
+    {'name': "hb-fontsets", 'sizes': [(800, 200)]}
     ]
 
 def render(filename, width, height, bbox, quiet=False):