From 2d96b9a83545239bc09151952d762b9ccc056912 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 31 Jan 2014 21:35:34 +0530
Subject: [PATCH] Edit Book: Fix subsetting embedded fonts not processing fonts
 included in a stylesheet that is itself referenced only by an @import rule

---
 resources/compiled_coffeescript.zip           | Bin 78502 -> 78965 bytes
 .../ebooks/oeb/polish/font_stats.coffee       |  18 +++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index b8b57bf86a1918c87cf9833b99ebfb5dc9d98fea..cc015df94aeef8b9a64a4aca6eb6bd8b111dddd6 100644
GIT binary patch
delta 853
zcmZ`&&ubGw6wccuVppx9O`6(JGpMB5u+3(Rf+enAtPrZS#OOt34aqJIgiYAl6-p@{
z1Q8U840KL{1<^u9Q!hD+cvVoLe?n0NFJh0Pv$Nz!DbBLPzHi=q^S$rQzSs%veh(!U
z=YyeWz#C^@UAS1iZapB8K)`#G^os&9x{Y9CN=8k)Q86&q&4%UZX1QYMwp%y)I9@Ug
zhbjnW$un5!gipZN(B1APzKAqrx>m)hHLNrTWYi<W5?T=v8+Xb!@`?4DjP$x;vDr3E
zK4Z7;;5^UsFh<CEvK5SrOiX`?Cn7D3ZrsX?WPSI1ka3do;V3anBlM;ONwU!%?#b)P
z;5DWF^LrqcB>zl=R*_N12CA8eCuN=Grhzm~<C3$5D~k)ol3u)ac@CvgK8Bs;x^dO>
zrdy#`B~#BNlGp8nnLQTyto=QE93qcLCp_8YPx~mTB}Pj=i|@#4USz&>$$Hv(L4(Hc
zt8Kt{vziy_iUg<VO9@U-*oNcU)<BQ4O&2ev&8pP-lmZzd-J5`AzYk>n(m2)9&`Nf7
z@b>I)HbJp*s>m?XIg<e#zSoL(T5(7YZHf2e2@s;e|6Rxr3Y-*qao8z4nEq5?TKF7U
zQz1s)#ShVQImif+DIWiw9;Oeycqiw@^kWWYgu)~CT@dEhICNWO(3|J<J%T8Cx;aF*
zRF?mHlP~^KAr}lC0SYQa>Ff-Q(YFd54}LoaPbMeF7U#nUyuU_d&krFGa8+Q@Kf~G)
AApigX

delta 400
zcmezRf@RrLmhI0a87GK0UlQ1UNq|wFQ*c(nJ*RJdL0^yXF))Cz{PYEej7k%2XHPGb
zWVD=oe<#=EeZ8)m+ZivhY_{Q4Vw6hJQAo?rD~V4_OinG<Q79_SN!3v(&PYuynf!oP
zdUE<p{>g1z6QtscQqv3-Y#}mw$;HJ%K!wHDTnY-4&-u7c?(*fGJi%OW@(N#}$u8{j
zlMisHuqXh*<OduU>>vgZOqS!6nEdUh&}4-Y&gly3jC`AYxm#JMi<>ZNOrLMaD8^n;
zlv<XVT0VWhA)_u+pZH`(L(%EXMvSIR=XAkre<MZ<rp4w!w(Rs}MvPia?2|#_ldF2T
zrhf$SndeSUoF+Tn${5JbT|IrFA*0CT`%5^dH-iK=Z2}u|#F){5`H(Q<bVXi9Ih_D+
uMkWzv5e5*z2s*GRj998L-O+?mWTFADSb#Sx8%UT72wyQVFf7w&1o8kSc6VR^

diff --git a/src/calibre/ebooks/oeb/polish/font_stats.coffee b/src/calibre/ebooks/oeb/polish/font_stats.coffee
index e5e29becd1..d305a86237 100644
--- a/src/calibre/ebooks/oeb/polish/font_stats.coffee
+++ b/src/calibre/ebooks/oeb/polish/font_stats.coffee
@@ -38,6 +38,18 @@ font_usage = (node) ->
     ans['text'] = text
     return ans
 
+process_sheet = (sheet, font_faces) ->
+    for rule in sheet.cssRules
+        if rule.type == rule.FONT_FACE_RULE
+            process_font_face_rule(rule, font_faces)
+        else if rule.type == rule.IMPORT_RULE and rule.styleSheet
+            process_sheet(rule.styleSheet, font_faces)
+
+process_font_face_rule = (rule, font_faces) ->
+    fd = font_dict(rule.style)
+    fd['src'] = rule.style.getPropertyValue('src')
+    font_faces.push(fd)
+
 class FontStats
     # This class is a namespace to expose functions via the
     # window.font_stats object.
@@ -49,11 +61,7 @@ class FontStats
     get_font_face_rules: () ->
         font_faces = []
         for sheet in document.styleSheets
-            for rule in sheet.cssRules
-                if rule.type == rule.FONT_FACE_RULE
-                    fd = font_dict(rule.style)
-                    fd['src'] = rule.style.getPropertyValue('src')
-                    font_faces.push(fd)
+            process_sheet(sheet, font_faces)
         py_bridge.value = font_faces
 
     get_font_usage: () ->