From ab99e2f8bd62ac189ec701653d66a785cdc520ba Mon Sep 17 00:00:00 2001 From: Rod Sheeter Date: Wed, 4 Mar 2015 12:27:22 -0800 Subject: [PATCH] Per discussion with WG, update table ordering to what OTS expects. Once browsers are on latest cut of OTS we will go back to spec order. --- src/font.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/font.cc b/src/font.cc index 3c2e652..ee34c43 100644 --- a/src/font.cc +++ b/src/font.cc @@ -49,8 +49,11 @@ std::vector Font::OutputOrderedTags() const { output_order.push_back(table.tag); } - // alphabetize (not required), then put loca immediately after glyf (required) + // Alphabetize and do not put loca immediately after glyf + // This violates woff2 spec but results in a font that passes OTS std::sort(output_order.begin(), output_order.end()); + // TODO(user): change to match spec once browsers are on newer OTS + /* auto glyf_loc = std::find(output_order.begin(), output_order.end(), kGlyfTableTag); auto loca_loc = std::find(output_order.begin(), output_order.end(), @@ -59,7 +62,7 @@ std::vector Font::OutputOrderedTags() const { output_order.erase(loca_loc); output_order.insert(std::find(output_order.begin(), output_order.end(), kGlyfTableTag) + 1, kLocaTableTag); - } + }*/ return output_order; }