From cef5307b16e8df550c9ecf9704449e55b9137be2 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 23 Jun 2023 13:30:37 +0200 Subject: [PATCH 01/16] Add support for predesigned covers to Marquise. Remove support for changing cover class by metadata. --- src/librarian/cover.py | 14 +- src/librarian/covers/marquise.py | 155 +++++++++++---------- src/librarian/covers/widgets/background.py | 37 +++-- 3 files changed, 117 insertions(+), 89 deletions(-) diff --git a/src/librarian/cover.py b/src/librarian/cover.py index 0e9b079..9cd813a 100644 --- a/src/librarian/cover.py +++ b/src/librarian/cover.py @@ -153,6 +153,15 @@ class Cover(object): def __init__(self, book_info, format=None, width=None, height=None, cover_logo=None): self.book_info = book_info + + self.predesigned = False + if book_info.cover_class == 'image': + self.predesigned = True + + # TODO: deprecated + if book_info.cover_box_position == 'none': + self.predesigned = True + self.authors = [auth.readable() for auth in book_info.authors] self.title = book_info.title if format is not None: @@ -1005,9 +1014,10 @@ COVER_CLASSES = { def make_cover(book_info, *args, **kwargs): + cover_class_name = None if 'cover_class' in kwargs: cover_class_name = kwargs.pop('cover_class') - else: - cover_class_name = book_info.cover_class + if not cover_class_name: + cover_class_name = 'default' cover_class = COVER_CLASSES[cover_class_name] return cover_class(book_info, *args, **kwargs) diff --git a/src/librarian/covers/marquise.py b/src/librarian/covers/marquise.py index d0ce49e..830c7b6 100644 --- a/src/librarian/covers/marquise.py +++ b/src/librarian/covers/marquise.py @@ -81,74 +81,81 @@ class MarquiseCover(Cover): def image(self): img = PIL.Image.new('RGB', (self.m.width, self.m.height), self.background_color) - bg = Background(self) - - if self.square_variant: - layout_options = [ - (self.m.marquise_small, 1), - (self.m.marquise_big, 2), - (self.m.marquise_big, 3), - (self.m.marquise_big, None), - ] + if self.predesigned: + bg = Background(self, crop_to_square=False) + bg.apply( + img, + 0, 0, + self.m.width, self.m.height + ) else: - layout_options = [ - (self.m.marquise_small, 2), - (self.m.marquise_small, 1), - (self.m.marquise_big, 3), - (self.m.marquise_xl, 4), - (self.m.marquise_xl, None), - ] - - # Trying all the layout options with decreasing scale. - title_box = None - title_scale = 1 - while title_box is None: - for marquise_h, lines in layout_options: - title_box_height = marquise_h - self.m.title_box_top - self.m.margin - try: - title_box = TitleBox( - self, - self.m.width - 2 * self.m.margin, - title_box_height, - lines, - scale=title_scale - ) - except DoesNotFit: - continue - else: - break - title_scale *= .99 - - self.marquise_height = marquise_h - marquise = Marquise(self, marquise_h) - - bg.apply( - img, - 0, marquise.edge_top, - self.m.width, self.m.height - marquise.edge_top - ) - self.set_color_scheme_from( - img.crop(( + bg = Background(self) + if self.square_variant: + layout_options = [ + (self.m.marquise_small, 1), + (self.m.marquise_big, 2), + (self.m.marquise_big, 3), + (self.m.marquise_big, None), + ] + else: + layout_options = [ + (self.m.marquise_small, 2), + (self.m.marquise_small, 1), + (self.m.marquise_big, 3), + (self.m.marquise_xl, 4), + (self.m.marquise_xl, None), + ] + + # Trying all the layout options with decreasing scale. + title_box = None + title_scale = 1 + while title_box is None: + for marquise_h, lines in layout_options: + title_box_height = marquise_h - self.m.title_box_top - self.m.margin + try: + title_box = TitleBox( + self, + self.m.width - 2 * self.m.margin, + title_box_height, + lines, + scale=title_scale + ) + except DoesNotFit: + continue + else: + break + title_scale *= .99 + + self.marquise_height = marquise_h + marquise = Marquise(self, self.marquise_height) + + bg.apply( + img, 0, marquise.edge_top, - self.m.width, marquise.edge_top + ( - self.m.height - marquise.edge_top - ) / 4 - )) - ) - - marquise.apply( - img, 0, 0, self.m.width - ) - title_box.apply( - img, - marquise.title_box_position[0], - marquise.title_box_position[1], - ) - - AuthorBox(self, self.m.author_width).apply( - img, self.m.width - self.m.margin - self.m.author_width, self.m.margin - ) - WLLogo(self).apply(img, self.m.margin, self.m.margin, None, self.m.logo_h) + self.m.width, self.m.height - marquise.edge_top + ) + self.set_color_scheme_from( + img.crop(( + 0, marquise.edge_top, + self.m.width, marquise.edge_top + ( + self.m.height - marquise.edge_top + ) / 4 + )) + ) + + marquise.apply( + img, 0, 0, self.m.width + ) + title_box.apply( + img, + marquise.title_box_position[0], + marquise.title_box_position[1], + ) + + AuthorBox(self, self.m.author_width).apply( + img, self.m.width - self.m.margin - self.m.author_width, self.m.margin + ) + WLLogo(self).apply(img, self.m.margin, self.m.margin, None, self.m.logo_h) for logo in self.additional_logos: @@ -167,13 +174,13 @@ class LabelMarquiseCover(MarquiseCover): def image(self): img = super().image() - - Label(self).apply( - img, - self.m.label_left, - self.marquise_height - self.m.label_top, - self.m.label_w, - self.m.label_h - ) + if not self.predesigned: + Label(self).apply( + img, + self.m.label_left, + self.marquise_height - self.label_top, + self.m.label_w, + self.m.label_h + ) return img diff --git a/src/librarian/covers/widgets/background.py b/src/librarian/covers/widgets/background.py index 7836b5c..fd8c764 100644 --- a/src/librarian/covers/widgets/background.py +++ b/src/librarian/covers/widgets/background.py @@ -8,6 +8,10 @@ from .base import Widget class Background(Widget): transparency = False + def __init__(self, cover, crop_to_square=True): + self.crop_to_square = crop_to_square + super().__init__(cover) + def setup(self): self.img = None if self.cover.book_info.cover_url: @@ -21,25 +25,32 @@ class Background(Widget): img = PIL.Image.open(data) - # crop top square. - if img.size[1] > img.size[0]: - img = img.crop((0, 0, img.size[0], img.size[0])) - else: - left = round((img.size[0] - img.size[1])/2) - img = img.crop(( - left, - 0, - left + img.size[1], - img.size[1] - )) + if self.crop_to_square: + # crop top square. + if img.size[1] > img.size[0]: + img = img.crop((0, 0, img.size[0], img.size[0])) + else: + left = round((img.size[0] - img.size[1])/2) + img = img.crop(( + left, + 0, + left + img.size[1], + img.size[1] + )) self.img = img def build(self, w, h): if not self.img: return - kwadrat = round(max(w, h)) img = self.img - img = self.img.resize((kwadrat, kwadrat)) + scale = max( + w / img.size[0], + h / img.size[1] + ) + img = self.img.resize(( + round(scale * img.size[0]), + round(scale * img.size[1]), + )) img = img.crop(( int((img.size[0] - w) / 2), 0, -- 2.20.1 From e9aeedc51047d8d5e9e45c5253c776f8994da965 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 26 Jun 2023 12:28:10 +0200 Subject: [PATCH 02/16] Fix validation. --- setup.py | 2 +- src/librarian/elements/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c300f27..91378a6 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='2.6', + version='2.6.1', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/elements/__init__.py b/src/librarian/elements/__init__.py index ff4eb43..3e8e63f 100644 --- a/src/librarian/elements/__init__.py +++ b/src/librarian/elements/__init__.py @@ -86,7 +86,7 @@ WL_ELEMENTS = { "nota": blocks.Nota, "nota_red": comments.NotaRed, - "extra": comments.Abstrakt, + "extra": comments.Uwaga, "abstrakt": comments.Abstrakt, "naglowek_czesc": headers.NaglowekCzesc, -- 2.20.1 From 3a0c83394d5783715fab2be29fa1a9cfc3574e28 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 30 Jun 2023 16:27:14 +0200 Subject: [PATCH 03/16] Drop lots of legacy code. Support Python 3.7-3.11. --- MANIFEST.in | 3 - NOTICE | 4 +- README.md | 4 +- scripts/book2cover | 4 - scripts/book2epub | 32 - scripts/book2fb2 | 4 - scripts/book2html | 4 - scripts/book2mobi | 33 - scripts/book2partner | 79 - scripts/book2pdf | 4 - scripts/book2txt | 4 - scripts/bookfragments | 57 - scripts/fn_qualifiers_list_from_redmine.py | 36 - scripts/genslugs | 70 - setup.py | 18 +- src/librarian/__init__.py | 25 +- src/librarian/book2anything.py | 14 +- src/librarian/builders/__init__.py | 3 + src/librarian/builders/daisy.py | 3 + src/librarian/builders/epub.py | 32 +- src/librarian/builders/html.py | 17 +- src/librarian/builders/mobi.py | 5 +- src/librarian/builders/pdf.py | 3 + src/librarian/builders/sanitize.py | 3 + src/librarian/builders/txt.py | 12 +- src/librarian/command_line.py | 3 + src/librarian/cover.py | 58 +- src/librarian/covers/marquise.py | 3 + src/librarian/covers/utils/color.py | 3 + src/librarian/covers/utils/textbox.py | 6 +- src/librarian/covers/widgets/author.py | 7 +- src/librarian/covers/widgets/background.py | 3 + src/librarian/covers/widgets/base.py | 3 + src/librarian/covers/widgets/image.py | 3 + src/librarian/covers/widgets/marquise.py | 3 + src/librarian/covers/widgets/title.py | 5 +- src/librarian/dcparser.py | 24 +- src/librarian/document.py | 13 +- src/librarian/elements/__init__.py | 3 + src/librarian/elements/base.py | 17 +- src/librarian/elements/blocks/__init__.py | 3 + src/librarian/elements/blocks/dedykacja.py | 3 + src/librarian/elements/blocks/dlugi_cytat.py | 3 + src/librarian/elements/blocks/nota.py | 3 + src/librarian/elements/blocks/poezja_cyt.py | 3 + src/librarian/elements/blocks/ramka.py | 3 + src/librarian/elements/blocks/wywiad.py | 3 + src/librarian/elements/comments/__init__.py | 3 + src/librarian/elements/comments/abstrakt.py | 3 + src/librarian/elements/comments/nota_red.py | 3 + src/librarian/elements/comments/uwaga.py | 3 + src/librarian/elements/drama/__init__.py | 3 + src/librarian/elements/drama/didask_tekst.py | 3 + src/librarian/elements/drama/didaskalia.py | 3 + src/librarian/elements/drama/kwestia.py | 3 + src/librarian/elements/drama/lista_osob.py | 3 + src/librarian/elements/drama/lista_osoba.py | 3 + src/librarian/elements/drama/miejsce_czas.py | 3 + .../elements/drama/naglowek_listy.py | 3 + .../elements/drama/naglowek_osoba.py | 3 + src/librarian/elements/drama/osoba.py | 3 + src/librarian/elements/figures/__init__.py | 3 + src/librarian/elements/figures/animacja.py | 3 + src/librarian/elements/figures/ilustr.py | 13 +- src/librarian/elements/figures/kol.py | 3 + src/librarian/elements/figures/tabela.py | 3 + src/librarian/elements/figures/wiersz.py | 3 + src/librarian/elements/footnotes/__init__.py | 6 +- src/librarian/elements/front/__init__.py | 3 + src/librarian/elements/front/autor_utworu.py | 3 + src/librarian/elements/front/base.py | 3 + .../elements/front/dzielo_nadrzedne.py | 3 + src/librarian/elements/front/motto.py | 3 + src/librarian/elements/front/motto_podpis.py | 3 + src/librarian/elements/front/nazwa_utworu.py | 3 + src/librarian/elements/front/podtytul.py | 3 + src/librarian/elements/headers/__init__.py | 3 + .../elements/headers/naglowek_czesc.py | 3 + .../elements/headers/naglowek_podrozdzial.py | 3 + .../elements/headers/naglowek_rozdzial.py | 3 + .../elements/headers/naglowek_scena.py | 3 + .../elements/headers/podtytul_czesc.py | 3 + .../elements/headers/podtytul_podrozdzial.py | 3 + .../elements/headers/podtytul_rozdzial.py | 3 + src/librarian/elements/masters/__init__.py | 3 + src/librarian/elements/paragraphs/__init__.py | 3 + src/librarian/elements/paragraphs/akap.py | 3 + src/librarian/elements/poetry/__init__.py | 3 + src/librarian/elements/poetry/strofa.py | 3 + src/librarian/elements/poetry/wers.py | 3 + src/librarian/elements/poetry/wers_akap.py | 3 + src/librarian/elements/poetry/wers_cd.py | 3 + .../elements/poetry/wers_do_prawej.py | 3 + src/librarian/elements/poetry/wers_srodek.py | 3 + src/librarian/elements/poetry/wers_wciety.py | 3 + .../elements/poetry/zastepnik_wersu.py | 3 + src/librarian/elements/ref/__init__.py | 3 + src/librarian/elements/root/__init__.py | 3 + src/librarian/elements/separators/__init__.py | 3 + .../elements/separators/sekcja_asterysk.py | 3 + .../elements/separators/sekcja_swiatlo.py | 3 + .../elements/separators/separator_linia.py | 3 + src/librarian/elements/styles/__init__.py | 3 + src/librarian/elements/styles/indeks_dolny.py | 3 + src/librarian/elements/styles/mat.py | 3 + src/librarian/elements/styles/slowo_obce.py | 3 + src/librarian/elements/styles/tytul_dziela.py | 4 +- .../elements/styles/wieksze_odstepy.py | 3 + src/librarian/elements/styles/www.py | 3 + src/librarian/elements/styles/wyroznienie.py | 3 + src/librarian/elements/themes/__init__.py | 3 + src/librarian/elements/themes/begin.py | 3 + src/librarian/elements/themes/end.py | 3 + src/librarian/elements/themes/motyw.py | 3 + src/librarian/elements/tools/__init__.py | 3 + src/librarian/embeds/__init__.py | 5 +- src/librarian/embeds/latex.py | 6 +- src/librarian/embeds/mathml.py | 9 +- src/librarian/epub.py | 697 +-- src/librarian/epub/emptyChunk.xhtml | 8 - src/librarian/epub/toc.xhtml | 14 - src/librarian/epub/xsltAnnotations.xsl | 68 - src/librarian/epub/xsltChunkTitle.xsl | 38 - src/librarian/epub/xsltLast.xsl | 139 - src/librarian/epub/xsltScheme.xsl | 401 -- src/librarian/epub/xsltTitle.xsl | 148 - src/librarian/fb2.py | 9 +- src/librarian/fb2/description.xslt | 2 +- src/librarian/fb2/drama.xslt | 2 +- src/librarian/fb2/fb2.xslt | 8 +- src/librarian/fb2/footnotes.xslt | 2 +- src/librarian/fb2/inline.xslt | 2 +- src/librarian/fb2/paragraphs.xslt | 2 +- src/librarian/fb2/poems.xslt | 2 +- src/librarian/fb2/sections.xslt | 2 +- src/librarian/fn_qualifiers.py | 2 - .../font-optimizer/.hg/00changelog.i | Bin 57 -> 0 bytes src/librarian/font-optimizer/.hg/branch | 1 - .../font-optimizer/.hg/branchheads.cache | 2 - src/librarian/font-optimizer/.hg/dirstate | Bin 4501 -> 0 bytes src/librarian/font-optimizer/.hg/hgrc | 2 - src/librarian/font-optimizer/.hg/requires | 3 - .../font-optimizer/.hg/store/00changelog.i | Bin 6541 -> 0 bytes .../font-optimizer/.hg/store/00manifest.i | Bin 7321 -> 0 bytes .../font-optimizer/.hg/store/data/.hgignore.i | Bin 99 -> 0 bytes .../.hg/store/data/_font/_e_o_t_wrapper.pm.i | Bin 2657 -> 0 bytes .../.hg/store/data/_font/_subsetter.pm.i | Bin 20611 -> 0 bytes .../_font/_subsetter/_normalization_data.pm.i | Bin 13845 -> 0 bytes .../data/_font/_subsetter/create-data.pl.i | Bin 1430 -> 0 bytes .../.hg/store/data/_l_i_c_e_n_s_e.i | Bin 726 -> 0 bytes .../.hg/store/data/_r_e_a_d_m_e.txt.i | Bin 594 -> 0 bytes .../.hg/store/data/convert-eot.pl.i | Bin 579 -> 0 bytes .../store/data/ext/_font-_t_t_f/.cvsignore.i | Bin 81 -> 0 bytes .../data/ext/_font-_t_t_f/_c_o_p_y_i_n_g.i | Bin 3165 -> 0 bytes .../store/data/ext/_font-_t_t_f/_changes.i | Bin 222 -> 0 bytes .../_font-_t_t_f/_m_a_n_i_f_e_s_t._s_k_i_p.i | Bin 215 -> 0 bytes .../data/ext/_font-_t_t_f/_makefile._p_l.i | Bin 1497 -> 0 bytes .../ext/_font-_t_t_f/_r_e_a_d_m_e._t_x_t.i | Bin 1496 -> 0 bytes .../store/data/ext/_font-_t_t_f/_t_o_d_o.i | Bin 261 -> 0 bytes .../ext/_font-_t_t_f/lib/_font/_t_t_f.pm.i | Bin 490 -> 0 bytes .../lib/_font/_t_t_f/_a_a_t_kern.pm.i | Bin 1007 -> 0 bytes .../lib/_font/_t_t_f/_a_a_tutils.pm.i | Bin 3920 -> 0 bytes .../lib/_font/_t_t_f/_anchor.pm.i | Bin 1564 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_bsln.pm.i | Bin 1226 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_changes.i | Bin 1101 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_cmap.pm.i | Bin 5070 -> 0 bytes .../lib/_font/_t_t_f/_coverage.pm.i | Bin 2543 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_cvt__.pm.i | Bin 725 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_delta.pm.i | Bin 1319 -> 0 bytes .../lib/_font/_t_t_f/_dumper.pm.i | Bin 1118 -> 0 bytes .../lib/_font/_t_t_f/_e_b_d_t.pm.i | Bin 2122 -> 0 bytes .../lib/_font/_t_t_f/_e_b_l_c.pm.i | Bin 1743 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_fdsc.pm.i | Bin 865 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_feat.pm.i | Bin 1413 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_fmtx.pm.i | Bin 848 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_font.pm.i | Bin 7998 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_fpgm.pm.i | Bin 806 -> 0 bytes .../lib/_font/_t_t_f/_g_d_e_f.pm.i | Bin 2347 -> 0 bytes .../lib/_font/_t_t_f/_g_p_o_s.pm.i | Bin 4850 -> 0 bytes .../lib/_font/_t_t_f/_g_s_u_b.pm.i | Bin 2293 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_glyf.pm.i | Bin 1258 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_glyph.pm.i | Bin 6657 -> 0 bytes .../lib/_font/_t_t_f/_gr_feat.pm.i | Bin 1938 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_hdmx.pm.i | Bin 1293 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_head.pm.i | Bin 2251 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_hhea.pm.i | Bin 1282 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_hmtx.pm.i | Bin 1622 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_kern.pm.i | Bin 2356 -> 0 bytes .../lib/_font/_t_t_f/_kern/_class_array.pm.i | Bin 1060 -> 0 bytes .../_t_t_f/_kern/_compact_class_array.pm.i | Bin 560 -> 0 bytes .../lib/_font/_t_t_f/_kern/_ordered_list.pm.i | Bin 879 -> 0 bytes .../lib/_font/_t_t_f/_kern/_state_table.pm.i | Bin 1078 -> 0 bytes .../lib/_font/_t_t_f/_kern/_subtable.pm.i | Bin 1213 -> 0 bytes .../lib/_font/_t_t_f/_l_t_s_h.pm.i | Bin 708 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_loca.pm.i | Bin 1789 -> 0 bytes .../lib/_font/_t_t_f/_manual.pod.i | Bin 3830 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_maxp.pm.i | Bin 1539 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_mort.pm.i | Bin 780 -> 0 bytes .../lib/_font/_t_t_f/_mort/_chain.pm.i | Bin 1528 -> 0 bytes .../lib/_font/_t_t_f/_mort/_contextual.pm.i | Bin 1342 -> 0 bytes .../lib/_font/_t_t_f/_mort/_insertion.pm.i | Bin 1481 -> 0 bytes .../lib/_font/_t_t_f/_mort/_ligature.pm.i | Bin 2071 -> 0 bytes .../_font/_t_t_f/_mort/_noncontextual.pm.i | Bin 771 -> 0 bytes .../_font/_t_t_f/_mort/_rearrangement.pm.i | Bin 899 -> 0 bytes .../lib/_font/_t_t_f/_mort/_subtable.pm.i | Bin 1452 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_name.pm.i | Bin 9792 -> 0 bytes .../lib/_font/_t_t_f/_o_s__2.pm.i | Bin 2880 -> 0 bytes .../lib/_font/_t_t_f/_o_t_tags.pm.i | Bin 6368 -> 0 bytes .../lib/_font/_t_t_f/_old_cmap.pm.i | Bin 2925 -> 0 bytes .../lib/_font/_t_t_f/_old_mort.pm.i | Bin 4892 -> 0 bytes .../lib/_font/_t_t_f/_p_c_l_t.pm.i | Bin 1082 -> 0 bytes .../lib/_font/_t_t_f/_p_s_names.pm.i | Bin 28095 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_post.pm.i | Bin 3337 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_prep.pm.i | Bin 770 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_prop.pm.i | Bin 1251 -> 0 bytes .../lib/_font/_t_t_f/_segarr.pm.i | Bin 2556 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_sill.pm.i | Bin 1129 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_table.pm.i | Bin 3265 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_ttc.pm.i | Bin 1659 -> 0 bytes .../lib/_font/_t_t_f/_ttopen.pm.i | Bin 9985 -> 0 bytes .../lib/_font/_t_t_f/_useall.pm.i | Bin 381 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_utils.pm.i | Bin 5841 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_vhea.pm.i | Bin 1300 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_vmtx.pm.i | Bin 780 -> 0 bytes .../_font-_t_t_f/lib/_font/_t_t_f/_win32.pm.i | Bin 531 -> 0 bytes .../lib/_font/_t_t_f/_x_m_lparse.pm.i | Bin 1978 -> 0 bytes .../data/ext/_font-_t_t_f/lib/ttfmod.pl.i | Bin 2361 -> 0 bytes .../data/ext/_font-_t_t_f/t/_o_f_l.txt.i | Bin 2058 -> 0 bytes .../store/data/ext/_font-_t_t_f/t/tags.t.i | Bin 285 -> 0 bytes .../data/ext/_font-_t_t_f/t/testfont.ttf.i | Bin 18700 -> 0 bytes .../store/data/ext/_font-_t_t_f/t/ttfcopy.t.i | Bin 279 -> 0 bytes .../.hg/store/data/gen-tests.pl.i | Bin 3373 -> 0 bytes .../.hg/store/data/list-features.pl.i | Bin 569 -> 0 bytes .../.hg/store/data/modify-names.pl.i | Bin 1975 -> 0 bytes .../.hg/store/data/obfuscate-font.pl.i | Bin 1432 -> 0 bytes .../.hg/store/data/obfuscate-names.pl.i | Bin 1147 -> 0 bytes .../font-optimizer/.hg/store/data/subset.pl.i | Bin 3010 -> 0 bytes .../.hg/store/data/t/subsetter.pl.i | Bin 616 -> 0 bytes .../font-optimizer/.hg/store/fncache | 94 - src/librarian/font-optimizer/.hg/store/undo | Bin 3869 -> 0 bytes src/librarian/font-optimizer/.hg/tags.cache | 2 - src/librarian/font-optimizer/.hg/undo.branch | 1 - src/librarian/font-optimizer/.hg/undo.desc | 3 - .../font-optimizer/.hg/undo.dirstate | 0 src/librarian/font-optimizer/.hgignore | 4 - .../font-optimizer/Font/EOTWrapper.pm | 141 - .../font-optimizer/Font/Subsetter.pm | 1606 ------ .../Font/Subsetter/NormalizationData.pm | 1377 ----- .../Font/Subsetter/create-data.pl | 100 - src/librarian/font-optimizer/LICENSE | 21 - src/librarian/font-optimizer/README.txt | 23 - src/librarian/font-optimizer/convert-eot.pl | 62 - .../font-optimizer/ext/Font-TTF/.cvsignore | 2 - .../font-optimizer/ext/Font-TTF/COPYING | 76 - .../font-optimizer/ext/Font-TTF/Changes | 6 - .../font-optimizer/ext/Font-TTF/MANIFEST.SKIP | 26 - .../font-optimizer/ext/Font-TTF/Makefile.PL | 108 - .../font-optimizer/ext/Font-TTF/README.TXT | 99 - .../font-optimizer/ext/Font-TTF/TODO | 5 - .../ext/Font-TTF/lib/Font/TTF.pm | 24 - .../ext/Font-TTF/lib/Font/TTF/AATKern.pm | 140 - .../ext/Font-TTF/lib/Font/TTF/AATutils.pm | 689 --- .../ext/Font-TTF/lib/Font/TTF/Anchor.pm | 216 - .../ext/Font-TTF/lib/Font/TTF/Bsln.pm | 163 - .../ext/Font-TTF/lib/Font/TTF/Changes | 108 - .../ext/Font-TTF/lib/Font/TTF/Cmap.pm | 612 --- .../ext/Font-TTF/lib/Font/TTF/Coverage.pm | 323 -- .../ext/Font-TTF/lib/Font/TTF/Cvt_.pm | 81 - .../ext/Font-TTF/lib/Font/TTF/Delta.pm | 173 - .../ext/Font-TTF/lib/Font/TTF/Dumper.pm | 79 - .../ext/Font-TTF/lib/Font/TTF/EBDT.pm | 285 -- .../ext/Font-TTF/lib/Font/TTF/EBLC.pm | 228 - .../ext/Font-TTF/lib/Font/TTF/Fdsc.pm | 125 - .../ext/Font-TTF/lib/Font/TTF/Feat.pm | 191 - .../ext/Font-TTF/lib/Font/TTF/Fmtx.pm | 108 - .../ext/Font-TTF/lib/Font/TTF/Font.pm | 767 --- .../ext/Font-TTF/lib/Font/TTF/Fpgm.pm | 87 - .../ext/Font-TTF/lib/Font/TTF/GDEF.pm | 313 -- .../ext/Font-TTF/lib/Font/TTF/GPOS.pm | 701 --- .../ext/Font-TTF/lib/Font/TTF/GSUB.pm | 246 - .../ext/Font-TTF/lib/Font/TTF/Glyf.pm | 158 - .../ext/Font-TTF/lib/Font/TTF/Glyph.pm | 847 ---- .../ext/Font-TTF/lib/Font/TTF/GrFeat.pm | 249 - .../ext/Font-TTF/lib/Font/TTF/Hdmx.pm | 149 - .../ext/Font-TTF/lib/Font/TTF/Head.pm | 250 - .../ext/Font-TTF/lib/Font/TTF/Hhea.pm | 159 - .../ext/Font-TTF/lib/Font/TTF/Hmtx.pm | 214 - .../ext/Font-TTF/lib/Font/TTF/Kern.pm | 296 -- .../Font-TTF/lib/Font/TTF/Kern/ClassArray.pm | 153 - .../lib/Font/TTF/Kern/CompactClassArray.pm | 93 - .../Font-TTF/lib/Font/TTF/Kern/OrderedList.pm | 108 - .../Font-TTF/lib/Font/TTF/Kern/StateTable.pm | 143 - .../Font-TTF/lib/Font/TTF/Kern/Subtable.pm | 175 - .../ext/Font-TTF/lib/Font/TTF/LTSH.pm | 88 - .../ext/Font-TTF/lib/Font/TTF/Loca.pm | 183 - .../ext/Font-TTF/lib/Font/TTF/Manual.pod | 214 - .../ext/Font-TTF/lib/Font/TTF/Maxp.pm | 177 - .../ext/Font-TTF/lib/Font/TTF/Mort.pm | 108 - .../ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm | 196 - .../Font-TTF/lib/Font/TTF/Mort/Contextual.pm | 157 - .../Font-TTF/lib/Font/TTF/Mort/Insertion.pm | 179 - .../Font-TTF/lib/Font/TTF/Mort/Ligature.pm | 246 - .../lib/Font/TTF/Mort/Noncontextual.pm | 95 - .../lib/Font/TTF/Mort/Rearrangement.pm | 107 - .../Font-TTF/lib/Font/TTF/Mort/Subtable.pm | 200 - .../ext/Font-TTF/lib/Font/TTF/Name.pm | 782 --- .../ext/Font-TTF/lib/Font/TTF/OS_2.pm | 354 -- .../ext/Font-TTF/lib/Font/TTF/OTTags.pm | 706 --- .../ext/Font-TTF/lib/Font/TTF/OldCmap.pm | 358 -- .../ext/Font-TTF/lib/Font/TTF/OldMort.pm | 706 --- .../ext/Font-TTF/lib/Font/TTF/PCLT.pm | 121 - .../ext/Font-TTF/lib/Font/TTF/PSNames.pm | 4447 ----------------- .../ext/Font-TTF/lib/Font/TTF/Post.pm | 306 -- .../ext/Font-TTF/lib/Font/TTF/Prep.pm | 89 - .../ext/Font-TTF/lib/Font/TTF/Prop.pm | 154 - .../ext/Font-TTF/lib/Font/TTF/Segarr.pm | 376 -- .../ext/Font-TTF/lib/Font/TTF/Sill.pm | 114 - .../ext/Font-TTF/lib/Font/TTF/Table.pm | 382 -- .../ext/Font-TTF/lib/Font/TTF/Ttc.pm | 164 - .../ext/Font-TTF/lib/Font/TTF/Ttopen.pm | 1223 ----- .../ext/Font-TTF/lib/Font/TTF/Useall.pm | 54 - .../ext/Font-TTF/lib/Font/TTF/Utils.pm | 630 --- .../ext/Font-TTF/lib/Font/TTF/Vhea.pm | 159 - .../ext/Font-TTF/lib/Font/TTF/Vmtx.pm | 86 - .../ext/Font-TTF/lib/Font/TTF/Win32.pm | 33 - .../ext/Font-TTF/lib/Font/TTF/XMLparse.pm | 176 - .../font-optimizer/ext/Font-TTF/lib/ttfmod.pl | 174 - .../font-optimizer/ext/Font-TTF/t/OFL.txt | 94 - .../font-optimizer/ext/Font-TTF/t/tags.t | 11 - .../ext/Font-TTF/t/testfont.ttf | Bin 35624 -> 0 bytes .../font-optimizer/ext/Font-TTF/t/ttfcopy.t | 15 - src/librarian/font-optimizer/gen-tests.pl | 235 - src/librarian/font-optimizer/list-features.pl | 52 - src/librarian/font-optimizer/modify-names.pl | 209 - .../font-optimizer/obfuscate-font.pl | 114 - src/librarian/font-optimizer/subset.pl | 134 - src/librarian/font-optimizer/t/subsetter.pl | 47 - src/librarian/fonts.py | 35 +- src/librarian/functions.py | 18 +- src/librarian/html.py | 33 +- src/librarian/hyphenator.py | 2 - src/librarian/meta/types/base.py | 3 + src/librarian/meta/types/bool.py | 3 + src/librarian/meta/types/person.py | 5 +- src/librarian/meta/types/text.py | 3 + src/librarian/meta/types/wluri.py | 3 + src/librarian/mobi.py | 57 - src/librarian/packagers.py | 72 - src/librarian/parser.py | 50 +- src/librarian/partners.py | 140 - src/librarian/pdf.py | 22 +- src/librarian/pdf/wl.cls | 18 +- src/librarian/pdf/wl2tex.xslt | 2 +- src/librarian/picture.py | 32 +- src/librarian/{ => res}/epub/style.css | 0 src/librarian/{ => res}/epub/support.xhtml | 8 +- src/librarian/res/text/template.txt | 2 +- src/librarian/sponsor.py | 6 +- src/librarian/text.py | 15 +- src/librarian/util.py | 5 +- src/librarian/xslt/book2html.xslt | 2 +- src/librarian/xslt/book2txt.xslt | 2 +- src/librarian/xslt/config.xml | 142 - src/librarian/xslt/wl2html_base.xslt | 363 -- src/librarian/xslt/wl2html_full.xslt | 33 - src/librarian/xslt/wl2html_partial.xslt | 33 - .../dcparser/andersen_brzydkie_kaczatko.out | 34 +- .../dcparser/andersen_brzydkie_kaczatko.xml | 6 +- tests/files/dcparser/biedrzycki_akslop.out | 34 +- tests/files/dcparser/biedrzycki_akslop.xml | 10 +- tests/files/dcparser/kochanowski_piesn7.out | 34 +- tests/files/dcparser/kochanowski_piesn7.xml | 4 +- tests/files/dcparser/mickiewicz_rybka.out | 34 +- tests/files/dcparser/mickiewicz_rybka.xml | 6 +- tests/files/dcparser/sofokles_antygona.out | 38 +- tests/files/dcparser/sofokles_antygona.xml | 6 +- .../andersen_brzydkie_kaczatko.xml | 6 +- tests/files/dcserialize/biedrzycki_akslop.xml | 10 +- .../files/dcserialize/kochanowski_piesn7.xml | 4 +- tests/files/dcserialize/mickiewicz_rybka.xml | 6 +- tests/files/dcserialize/sofokles_antygona.xml | 6 +- tests/files/example-wl.xml | 2 +- tests/files/picture/angelus-novus.xml | 4 +- .../files/text/asnyk_miedzy_nami_expected.fb2 | 14 +- .../text/asnyk_miedzy_nami_expected.html | 8 +- .../asnyk_miedzy_nami_expected.legacy.html | 8 +- .../files/text/asnyk_miedzy_nami_expected.txt | 6 +- tests/files/text/asnyk_miedzy_nami_refs.html | 6 + tests/files/text/asnyk_zbior.xml | 2 +- tests/files/text/do-mlodych.xml | 4 +- tests/files/text/miedzy-nami-nic-nie-bylo.xml | 2 +- tests/test_dcparser.py | 82 +- tests/test_doctests.py | 16 + tests/test_epub.py | 158 +- tests/test_fb2.py | 22 +- tests/test_html.py | 47 +- tests/test_html_annotations.py | 71 +- tests/test_html_fragments.py | 11 +- tests/test_html_transform_abstrakt.py | 23 +- tests/test_mobi.py | 24 +- tests/test_pdf.py | 26 +- tests/test_picture.py | 97 +- tests/test_ref.py | 32 + tests/test_text.py | 25 +- tests/uat/main.xml | 2 +- tests/uat/parent.xml | 2 +- tests/uat/part2.xml | 2 +- tests/utils.py | 2 +- tox.ini | 15 +- 409 files changed, 1039 insertions(+), 30325 deletions(-) delete mode 100755 scripts/book2epub delete mode 100755 scripts/book2mobi delete mode 100755 scripts/book2partner delete mode 100755 scripts/bookfragments delete mode 100755 scripts/fn_qualifiers_list_from_redmine.py delete mode 100755 scripts/genslugs mode change 100755 => 100644 src/librarian/book2anything.py delete mode 100644 src/librarian/epub/emptyChunk.xhtml delete mode 100644 src/librarian/epub/toc.xhtml delete mode 100644 src/librarian/epub/xsltAnnotations.xsl delete mode 100644 src/librarian/epub/xsltChunkTitle.xsl delete mode 100644 src/librarian/epub/xsltLast.xsl delete mode 100644 src/librarian/epub/xsltScheme.xsl delete mode 100644 src/librarian/epub/xsltTitle.xsl delete mode 100644 src/librarian/font-optimizer/.hg/00changelog.i delete mode 100644 src/librarian/font-optimizer/.hg/branch delete mode 100644 src/librarian/font-optimizer/.hg/branchheads.cache delete mode 100644 src/librarian/font-optimizer/.hg/dirstate delete mode 100644 src/librarian/font-optimizer/.hg/hgrc delete mode 100644 src/librarian/font-optimizer/.hg/requires delete mode 100644 src/librarian/font-optimizer/.hg/store/00changelog.i delete mode 100644 src/librarian/font-optimizer/.hg/store/00manifest.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/.hgignore.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_font/_e_o_t_wrapper.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_font/_subsetter.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_font/_subsetter/_normalization_data.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_font/_subsetter/create-data.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_l_i_c_e_n_s_e.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/_r_e_a_d_m_e.txt.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/convert-eot.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/.cvsignore.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_c_o_p_y_i_n_g.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_changes.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_m_a_n_i_f_e_s_t._s_k_i_p.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_makefile._p_l.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_r_e_a_d_m_e._t_x_t.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_t_o_d_o.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_a_a_t_kern.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_a_a_tutils.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_anchor.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_bsln.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_changes.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_cmap.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_coverage.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_cvt__.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_delta.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_dumper.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_e_b_d_t.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_e_b_l_c.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fdsc.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_feat.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fmtx.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_font.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fpgm.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_g_d_e_f.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_g_p_o_s.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_g_s_u_b.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyf.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyph.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_gr_feat.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hdmx.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_head.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hhea.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hmtx.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_class_array.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_compact_class_array.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_ordered_list.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_state_table.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_subtable.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_l_t_s_h.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_loca.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_manual.pod.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_maxp.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_chain.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_contextual.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_insertion.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_ligature.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_noncontextual.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_rearrangement.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_subtable.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_name.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_s__2.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_t_tags.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_old_cmap.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_old_mort.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_c_l_t.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_s_names.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_post.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_prep.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_prop.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_segarr.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_sill.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_table.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttc.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttopen.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_useall.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_utils.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_vhea.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_vmtx.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_win32.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_x_m_lparse.pm.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/ttfmod.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/_o_f_l.txt.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/tags.t.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/testfont.ttf.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/ttfcopy.t.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/gen-tests.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/list-features.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/modify-names.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/obfuscate-font.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/obfuscate-names.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/subset.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/data/t/subsetter.pl.i delete mode 100644 src/librarian/font-optimizer/.hg/store/fncache delete mode 100644 src/librarian/font-optimizer/.hg/store/undo delete mode 100644 src/librarian/font-optimizer/.hg/tags.cache delete mode 100644 src/librarian/font-optimizer/.hg/undo.branch delete mode 100644 src/librarian/font-optimizer/.hg/undo.desc delete mode 100644 src/librarian/font-optimizer/.hg/undo.dirstate delete mode 100644 src/librarian/font-optimizer/.hgignore delete mode 100644 src/librarian/font-optimizer/Font/EOTWrapper.pm delete mode 100644 src/librarian/font-optimizer/Font/Subsetter.pm delete mode 100644 src/librarian/font-optimizer/Font/Subsetter/NormalizationData.pm delete mode 100644 src/librarian/font-optimizer/Font/Subsetter/create-data.pl delete mode 100644 src/librarian/font-optimizer/LICENSE delete mode 100644 src/librarian/font-optimizer/README.txt delete mode 100755 src/librarian/font-optimizer/convert-eot.pl delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/.cvsignore delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/COPYING delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/Changes delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/MANIFEST.SKIP delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/Makefile.PL delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/README.TXT delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/TODO delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATKern.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATutils.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Anchor.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Bsln.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Changes delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cmap.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Coverage.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cvt_.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Delta.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Dumper.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBDT.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBLC.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fdsc.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Feat.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fmtx.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Font.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fpgm.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GDEF.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GPOS.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GSUB.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyf.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyph.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GrFeat.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hdmx.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Head.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hhea.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hmtx.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/ClassArray.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/CompactClassArray.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/OrderedList.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/StateTable.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/Subtable.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/LTSH.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Loca.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Manual.pod delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Maxp.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Contextual.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Insertion.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Ligature.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Noncontextual.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Rearrangement.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Subtable.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Name.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OS_2.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OTTags.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldCmap.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldMort.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PCLT.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PSNames.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Post.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prep.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prop.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Segarr.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Sill.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Table.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttc.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttopen.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Useall.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Utils.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vhea.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vmtx.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Win32.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/XMLparse.pm delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/lib/ttfmod.pl delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/t/OFL.txt delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/t/tags.t delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/t/testfont.ttf delete mode 100644 src/librarian/font-optimizer/ext/Font-TTF/t/ttfcopy.t delete mode 100644 src/librarian/font-optimizer/gen-tests.pl delete mode 100755 src/librarian/font-optimizer/list-features.pl delete mode 100755 src/librarian/font-optimizer/modify-names.pl delete mode 100755 src/librarian/font-optimizer/obfuscate-font.pl delete mode 100755 src/librarian/font-optimizer/subset.pl delete mode 100644 src/librarian/font-optimizer/t/subsetter.pl delete mode 100644 src/librarian/mobi.py delete mode 100644 src/librarian/packagers.py delete mode 100644 src/librarian/partners.py rename src/librarian/{ => res}/epub/style.css (100%) rename src/librarian/{ => res}/epub/support.xhtml (76%) delete mode 100644 src/librarian/xslt/config.xml delete mode 100644 src/librarian/xslt/wl2html_base.xslt delete mode 100644 src/librarian/xslt/wl2html_full.xslt delete mode 100644 src/librarian/xslt/wl2html_partial.xslt create mode 100644 tests/files/text/asnyk_miedzy_nami_refs.html create mode 100644 tests/test_doctests.py create mode 100644 tests/test_ref.py diff --git a/MANIFEST.in b/MANIFEST.in index ec780e3..40f0f90 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,12 +5,9 @@ include tox.ini recursive-include scripts *.py *.css recursive-include tests *.py *.xml *.html *.out *.txt *.jpeg include src/librarian/xslt/*.xslt -include src/librarian/xslt/*.xml -include src/librarian/epub/* include src/librarian/pdf/* include src/librarian/fb2/* include src/librarian/fonts/* recursive-include src/librarian/locale *.po *.mo graft src/librarian/res -graft src/librarian/font-optimizer diff --git a/NOTICE b/NOTICE index e4e6ec5..74d2fbf 100644 --- a/NOTICE +++ b/NOTICE @@ -1,7 +1,7 @@ - FNP Librarian + WL Librarian - Copyright © 2010 Fundacja Nowoczesna Polska + Copyright © 2010-2023 Fundacja Wolne Lektury For full list of contributors see AUTHORS file. diff --git a/README.md b/README.md index dea2381..a64e37a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ License ![AGPL Logo](http://www.gnu.org/graphics/agplv3-155x51.png) - Copyright © 2008-2019 Fundacja Nowoczesna Polska + Copyright © 2008-2023 Fundacja Wolne Lektury For full list of contributors see AUTHORS file. @@ -24,7 +24,7 @@ License About ------ -Librarian converts XML-based markup language used by FNP for writing books to +Librarian converts XML-based markup language used by WL for writing books to other formats, which are more suitable for presentation. Currently we support: diff --git a/scripts/book2cover b/scripts/book2cover index a81fc63..3e0fd21 100755 --- a/scripts/book2cover +++ b/scripts/book2cover @@ -1,11 +1,7 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian.book2anything import Book2Anything, Option diff --git a/scripts/book2epub b/scripts/book2epub deleted file mode 100755 index f4d5617..0000000 --- a/scripts/book2epub +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import unicode_literals - -from librarian.book2anything import Book2Anything, Option - - -class Book2Epub(Book2Anything): - format_name = "EPUB" - ext = "epub" - uses_cover = True - uses_provider = True - transform_flags = [ - Option('-w', '--working-copy', dest='working-copy', - action='store_true', default=False, - help='mark the output as a working copy' - ) - ] - transform_options = [ - Option( - '-b', '--base-url', dest='base_url', metavar='URL', - help='specifies the base URL for relative image references' - ), - ] - - -if __name__ == '__main__': - Book2Epub.run() diff --git a/scripts/book2fb2 b/scripts/book2fb2 index de4615b..51b7931 100755 --- a/scripts/book2fb2 +++ b/scripts/book2fb2 @@ -1,11 +1,7 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian.book2anything import Book2Anything diff --git a/scripts/book2html b/scripts/book2html index 66b8999..8eadb04 100755 --- a/scripts/book2html +++ b/scripts/book2html @@ -1,11 +1,7 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian.book2anything import Book2Anything, Option diff --git a/scripts/book2mobi b/scripts/book2mobi deleted file mode 100755 index 174ef57..0000000 --- a/scripts/book2mobi +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import unicode_literals - -from librarian.book2anything import Book2Anything, Option - - -class Book2Mobi(Book2Anything): - format_name = "MOBI" - ext = "mobi" - uses_cover = True - cover_optional = False - uses_provider = True - - transform_options = [ - Option( - '-k', '--use-kindlegen', - action='store_true', dest='use_kindlegen', default=False, - help='use kindlegen tool instead of Calibre' - ), - Option( - '-b', '--base-url', dest='base_url', metavar='URL', - help='specifies the base URL for relative image references' - ), - ] - - -if __name__ == '__main__': - Book2Mobi.run() diff --git a/scripts/book2partner b/scripts/book2partner deleted file mode 100755 index 8982354..0000000 --- a/scripts/book2partner +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import print_function, unicode_literals - -from collections import OrderedDict -import inspect -import optparse -import os -import sys - -from librarian import packagers - - -if __name__ == '__main__': - # Parse commandline arguments - usage = """Usage: %prog [options] SOURCE [SOURCE...] - Prepare SOURCE files for a partner.""" - - parser = optparse.OptionParser(usage=usage) - - parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, - help='print status messages to stdout') - parser.add_option('-O', '--output-dir', dest='output_dir', metavar='DIR', default='', - help='specifies the directory for output') - parser.add_option('-f', '--force-overwrite', - action='store_true', - dest='overwrite', - default=False, - help='rebuild the file even if it already exists') - parser.add_option('-p', '--packages', - dest='packages', - metavar='package,...', - default='', - help='lists packages to build') - parser.add_option('-m', '--packages-modules', - dest='packages_modules', metavar='path.to.module,...', - default='librarian.partners', - help='modules with packages definitions to load') - parser.add_option('-l', '--list-packages', - action='store_true', - dest='list_packages', - default=False, - help='lists available packages') - - options, input_filenames = parser.parse_args() - packages = OrderedDict() - - sys.path.insert(0, os.getcwd()) - for module_name in options.packages_modules.split(','): - if not module_name: - continue - module = __import__(module_name, globals(), locals(), ['*']) - for package_name in dir(module): - package = getattr(module, package_name) - if inspect.isclass(package) and issubclass(package, packagers.Packager): - packages[package_name] = package - if not packages: - print('No packages found!') - - if options.list_packages: - print('Available packages:') - for package_name, package in packages.items(): - print(' ', package_name) - exit(0) - - if len(input_filenames) < 1 or not options.packages: - parser.print_help() - exit(1) - - used_packages = [packages[p] for p in options.packages.split(',')] - for package in used_packages: - if options.verbose: - print('Package:', package.__name__) - package.prepare(input_filenames, - options.output_dir, options.verbose, options.overwrite) diff --git a/scripts/book2pdf b/scripts/book2pdf index b3f422e..c80bfe6 100755 --- a/scripts/book2pdf +++ b/scripts/book2pdf @@ -1,11 +1,7 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian.book2anything import Book2Anything, Option diff --git a/scripts/book2txt b/scripts/book2txt index 0e84ac9..8b75f98 100755 --- a/scripts/book2txt +++ b/scripts/book2txt @@ -1,11 +1,7 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian.book2anything import Book2Anything, Option from librarian.parser import WLDocument diff --git a/scripts/bookfragments b/scripts/bookfragments deleted file mode 100755 index b283297..0000000 --- a/scripts/bookfragments +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import print_function, unicode_literals - -import os -import optparse - -from librarian import html - - -if __name__ == '__main__': - # Parse commandline arguments - usage = """Usage: %prog [options] SOURCE [SOURCE...] - Extract theme fragments from SOURCE.""" - - parser = optparse.OptionParser(usage=usage) - - parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, - help='print status messages to stdout') - - options, input_filenames = parser.parse_args() - - if len(input_filenames) < 1: - parser.print_help() - exit(1) - - # Do some real work - for input_filename in input_filenames: - if options.verbose: - print(input_filename) - - output_filename = os.path.splitext(input_filename)[0] + '.fragments.html' - - closed_fragments, open_fragments = html.extract_fragments(input_filename) - - for fragment_id in open_fragments: - print('%s:warning:unclosed fragment #%s' % (input_filename, fragment_id)) - - output_file = open(output_filename, 'w') - output_file.write(""" - - - bookfragments output - - - - """) - for fragment in closed_fragments.values(): - fragment_html = u'

[#%s] %s

%s
' % (fragment.id, fragment.themes, fragment) - output_file.write(fragment_html.encode('utf-8')) - output_file.write('') - output_file.close() - diff --git a/scripts/fn_qualifiers_list_from_redmine.py b/scripts/fn_qualifiers_list_from_redmine.py deleted file mode 100755 index 66b00cc..0000000 --- a/scripts/fn_qualifiers_list_from_redmine.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 - -""" -This scripts reads the table of footnote qualifiers from Redmine -and produces contents of fn_qualifiers.py – a list of valid qualifiers. -""" -from __future__ import print_function, unicode_literals - -from lxml import etree -from six.moves.urllib.request import urlopen - -url = 'http://redmine.nowoczesnapolska.org.pl/projects/wl-publikacje/wiki/Lista_skr%C3%B3t%C3%B3w' - -parser = etree.HTMLParser() -tree = etree.parse(urlopen(url), parser) - -print("""\ -# -*- coding: utf-8 -\""" -List of standard footnote qualifiers. -This file is generated by scripts/fn_qualifiers_list_from_wiki.py, -do not edit it. -\""" -from __future__ import unicode_literals - - -FN_QUALIFIERS = {""") - -for td in tree.findall('//td'): - print((" '%s': '%s'," % ( - td[0].text.replace('\\', '\\\\').replace("'", "\\'"), - td[0].tail.strip(' -').replace('\\', '\\\\').replace("'", "\\'") - ))) - -print(""" }""") diff --git a/scripts/genslugs b/scripts/genslugs deleted file mode 100755 index 9745b68..0000000 --- a/scripts/genslugs +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import print_function, unicode_literals - -import os -import optparse - -from lxml import etree -from librarian import html -from slughifi import slughifi - - -BOOK_URL = 'http://wolnelektury.pl/katalog/lektura/' - - -if __name__ == '__main__': - # Parse commandline arguments - usage = """Usage: %prog [options] SOURCE [SOURCE...] - Generate slugs for SOURCE.""" - - parser = optparse.OptionParser(usage=usage) - - parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, - help='print status messages to stdout') - parser.add_option('-f', '--force', action='store_true', dest='force', default=False, - help='overwrite current identifiers') - - options, input_filenames = parser.parse_args() - - if len(input_filenames) < 1: - parser.print_help() - exit(1) - - # Do some real work - for input_filename in input_filenames: - if options.verbose: - print(input_filename) - - doc = etree.parse(input_filename) - try: - title = doc.find('//{http://purl.org/dc/elements/1.1/}title').text - except AttributeError: - print('%s:error:Book title not found. Skipping.' % input_filename) - continue - - parent = '' - try: - parent_url = doc.find('//{http://purl.org/dc/elements/1.1/}relation.isPartOf').text - parent = parent_url.rsplit('/', 1)[1] + ' ' - except AttributeError: - pass - except IndexError: - print('%s:error:Invalid parent URL "%s". Skipping.' % (input_filename, parent_url)) - - book_url = doc.find('//{http://purl.org/dc/elements/1.1/}identifier.url') - if book_url is None: - book_description = doc.find('//{http://www.w3.org/1999/02/22-rdf-syntax-ns#}Description') - book_url = etree.SubElement(book_description, '{http://purl.org/dc/elements/1.1/}identifier.url') - if not options.force and book_url.text.startswith('http://'): - print('%s:Notice:Book already has identifier URL "%s". Skipping.' % (input_filename, book_url.text)) - continue - - book_url.text = BOOK_URL + slughifi(parent + title)[:60] - - doc.write(input_filename, xml_declaration=True, pretty_print=True, encoding='utf-8') - diff --git a/setup.py b/setup.py index 91378a6..0b8c47a 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # import os import os.path @@ -27,24 +27,24 @@ setup( author="Marek Stępniowski", author_email='marek@stepniowski.com', maintainer='Radek Czajka', - maintainer_email='radoslaw.czajka@nowoczesnapolska.org.pl', + maintainer_email='radekczajka@wolnelektury.pl', url='http://github.com/fnp/librarian', packages=find_packages(where="src"), package_dir={"": "src"}, - package_data={'librarian': ['xslt/*.xslt', 'xslt/*.xml', 'epub/*', 'pdf/*', 'fb2/*', 'fonts/*'] + + package_data={'librarian': ['xslt/*.xslt', 'pdf/*', 'fb2/*', 'fonts/*'] + whole_tree(os.path.join(os.path.dirname(__file__), 'src/librarian'), 'res') + - whole_tree(os.path.join(os.path.dirname(__file__), 'src/librarian'), 'font-optimizer') + whole_tree(os.path.join(os.path.dirname(__file__), 'src/librarian'), 'locale')}, include_package_data=True, install_requires=[ 'lxml>=2.2,<5.0', - 'Pillow', - 'six', + 'Pillow>=9.1.0', 'texml', 'ebooklib', 'aeneas', 'mutagen', 'qrcode', + 'requests', + 'fonttools', ], entry_points = { "console_scripts": [ @@ -53,12 +53,8 @@ setup( }, scripts=['scripts/book2html', 'scripts/book2txt', - 'scripts/book2epub', - 'scripts/book2mobi', 'scripts/book2pdf', 'scripts/book2fb2', - 'scripts/book2partner', 'scripts/book2cover', - 'scripts/bookfragments', - 'scripts/genslugs'], + ], ) diff --git a/src/librarian/__init__.py b/src/librarian/__init__.py index 35c54e0..0ed908c 100644 --- a/src/librarian/__init__.py +++ b/src/librarian/__init__.py @@ -1,33 +1,28 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import print_function, unicode_literals - +import io import os import re import shutil from tempfile import NamedTemporaryFile import urllib from lxml import etree -import six -from six.moves.urllib.request import FancyURLopener +from urllib.request import FancyURLopener from .util import makedirs # Compatibility imports. from .meta.types.wluri import WLURI -@six.python_2_unicode_compatible class UnicodeException(Exception): def __str__(self): """ Dirty workaround for Python Unicode handling problems. """ args = self.args[0] if len(self.args) == 1 else self.args try: - message = six.text_type(args) + message = str(args) except UnicodeDecodeError: - message = six.text_type(args, encoding='utf-8', errors='ignore') + message = str(args, encoding='utf-8', errors='ignore') return message @@ -49,7 +44,7 @@ class NoProvider(UnicodeException): pass -class XMLNamespace(object): +class XMLNamespace: '''A handy structure to repsent names in an XML namespace.''' def __init__(self, uri): @@ -86,7 +81,7 @@ PLMETNS = XMLNamespace("http://dl.psnc.pl/schemas/plmet/") WLNS = EmptyNamespace() -class DocProvider(object): +class DocProvider: """Base class for a repository of XML files. Used for generating joined files, like EPUBs. @@ -113,7 +108,7 @@ def get_resource(path): return os.path.join(os.path.dirname(__file__), path) -class OutputFile(object): +class OutputFile: """Represents a file returned by one of the converters.""" _bytes = None @@ -155,7 +150,7 @@ class OutputFile(object): """Get file as a file-like object.""" if self._bytes is not None: - return six.BytesIO(self._bytes) + return io.BytesIO(self._bytes) elif self._filename is not None: return open(self._filename, 'rb') @@ -182,7 +177,7 @@ class OutputFile(object): class URLOpener(FancyURLopener): - version = 'FNP Librarian (http://github.com/fnp/librarian)' + version = 'WL Librarian (http://github.com/fnp/librarian)' urllib._urlopener = URLOpener() diff --git a/src/librarian/book2anything.py b/src/librarian/book2anything.py old mode 100755 new mode 100644 index a1d5687..b9e2a33 --- a/src/librarian/book2anything.py +++ b/src/librarian/book2anything.py @@ -1,20 +1,14 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import print_function, unicode_literals - import os.path import optparse -import six from librarian import DirDocProvider, ParseError from librarian.parser import WLDocument from librarian.cover import make_cover, COVER_CLASSES -class Option(object): +class Option: """Option for optparse. Use it like `optparse.OptionParser.add_option`.""" def __init__(self, *names, **options): self.names = names @@ -30,7 +24,7 @@ class Option(object): return getattr(options, self.name()) -class Book2Anything(object): +class Book2Anything: """A class for creating book2... scripts. Subclass it for any format you want to convert to. @@ -137,7 +131,7 @@ class Book2Anything(object): if options.verbose: print(main_input) - if isinstance(main_input, six.binary_type): + if isinstance(main_input, bytes): main_input = main_input.decode('utf-8') # Where to find input? diff --git a/src/librarian/builders/__init__.py b/src/librarian/builders/__init__.py index 5e3266c..e47c557 100644 --- a/src/librarian/builders/__init__.py +++ b/src/librarian/builders/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from collections import OrderedDict from .txt import TxtBuilder from .html import HtmlBuilder, SnippetHtmlBuilder, StandaloneHtmlBuilder, DaisyHtmlBuilder diff --git a/src/librarian/builders/daisy.py b/src/librarian/builders/daisy.py index a117895..c706cbd 100644 --- a/src/librarian/builders/daisy.py +++ b/src/librarian/builders/daisy.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from copy import deepcopy import subprocess import tempfile diff --git a/src/librarian/builders/epub.py b/src/librarian/builders/epub.py index 8544846..8f21879 100644 --- a/src/librarian/builders/epub.py +++ b/src/librarian/builders/epub.py @@ -1,13 +1,15 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from datetime import date +import io import os import tempfile from ebooklib import epub from lxml import etree -import six from librarian import functions, OutputFile, get_resource, XHTMLNS from librarian.cover import make_cover from librarian.embeds.mathml import MathML -import librarian.epub from librarian.fonts import strip_font @@ -235,7 +237,7 @@ class EpubBuilder(Builder): p = etree.XML("""

Ta lektura, podobnie jak tysiące innych, jest dostępna on-line na stronie - wolnelektury.pl. + wolnelektury.pl.

""") p[0].attrib['href'] = str(self.document.meta.url) tp.append(p) @@ -245,7 +247,7 @@ class EpubBuilder(Builder): tp.append(etree.XML("""

- Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Nowoczesna Polska. + Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Wolne Lektury.

""")) @@ -253,7 +255,7 @@ class EpubBuilder(Builder): etree.SubElement(tp, 'p', **{"class": "info"}).text = getattr(self.document.meta, self.isbn_field) tp.append(etree.XML("""

- WolneLektury.pl + WolneLektury.pl

""")) self.add_html( @@ -280,13 +282,13 @@ class EpubBuilder(Builder): for i, author in enumerate(self.document.meta.authors): self.output.add_author( author.readable(), - file_as=six.text_type(author), + file_as=str(author), uid='creator{}'.format(i) ) for translator in self.document.meta.translators: self.output.add_author( translator.readable(), - file_as=six.text_type(translator), + file_as=str(translator), role='trl', uid='translator{}'.format(i) ) @@ -317,7 +319,7 @@ class EpubBuilder(Builder): def add_support_page(self): self.add_file( - get_resource('epub/support.xhtml'), + get_resource('res/epub/support.xhtml'), spine=True, toc='Wesprzyj Wolne Lektury' ) @@ -327,7 +329,7 @@ class EpubBuilder(Builder): media_type='image/png' ) self.add_file( - get_resource('epub/style.css'), + get_resource('res/epub/style.css'), media_type='text/css' ) @@ -379,8 +381,6 @@ class EpubBuilder(Builder): doctype='' ) - html = librarian.epub.squeeze_whitespace(html) - self.add_file( content=html, **kwargs @@ -556,7 +556,7 @@ class EpubBuilder(Builder): p[-1].tail = '.' etree.SubElement(p, "br") p[-1].tail = ( - "Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania " + "Fundacja Wolne Lektury zastrzega sobie prawa do wydania " "krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich " "i prawach pokrewnych. Wykorzystując zasoby z Wolnych Lektur, " "należy pamiętać o zapisach licencji oraz zasadach, które " @@ -587,9 +587,11 @@ class EpubBuilder(Builder): newp().text = m.description - if m.editors: + editors = self.document.editors() + if editors: newp().text = 'Opracowanie redakcyjne i przypisy: %s.' % ( - ', '.join(e.readable() for e in sorted(self.document.editors()))) + ', '.join(e.readable() for e in sorted(editors)) + ) if m.funders: etree.SubElement(d, 'p', {'class': 'minor-info'}).text = '''Publikację wsparli i wsparły: @@ -664,7 +666,7 @@ class EpubBuilder(Builder): cover_maker = self.make_cover - cover_file = six.BytesIO() + cover_file = io.BytesIO() cover = cover_maker(self.document.meta, width=600) cover.save(cover_file) cover_name = 'cover.%s' % cover.ext() diff --git a/src/librarian/builders/html.py b/src/librarian/builders/html.py index 7504a66..0499d43 100644 --- a/src/librarian/builders/html.py +++ b/src/librarian/builders/html.py @@ -1,10 +1,7 @@ -# coding: utf-8 -from __future__ import unicode_literals - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# +from urllib.request import urlopen from lxml import etree from librarian.html import add_anchors, add_table_of_contents, add_table_of_themes from librarian import OutputFile @@ -101,6 +98,9 @@ class HtmlBuilder: ) self.exit_fragment() + if len(self.header): + self.tree.insert(0, self.header) + if self.with_anchors: add_anchors(self.tree) if self.with_nota_red and len(self.nota_red): @@ -110,9 +110,6 @@ class HtmlBuilder: if self.with_toc: add_table_of_contents(self.tree) - if len(self.header): - self.tree.insert(0, self.header) - if self.footnote_counter: fnheader = etree.Element("h3") fnheader.text = _("Footnotes") diff --git a/src/librarian/builders/mobi.py b/src/librarian/builders/mobi.py index 19b5036..a001e90 100644 --- a/src/librarian/builders/mobi.py +++ b/src/librarian/builders/mobi.py @@ -1,5 +1,7 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import os -import six import subprocess from tempfile import NamedTemporaryFile from librarian import functions, get_resource, OutputFile @@ -41,5 +43,6 @@ class MobiBuilder(EpubBuilder): '--mobi-file-type=both', '--mobi-ignore-margins', ], **gen_kwargs) + devnull.close() return OutputFile.from_filename(output_file.name) diff --git a/src/librarian/builders/pdf.py b/src/librarian/builders/pdf.py index 6b2501e..d2dace6 100644 --- a/src/librarian/builders/pdf.py +++ b/src/librarian/builders/pdf.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from librarian import OutputFile diff --git a/src/librarian/builders/sanitize.py b/src/librarian/builders/sanitize.py index 9897482..74a9b44 100644 --- a/src/librarian/builders/sanitize.py +++ b/src/librarian/builders/sanitize.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from lxml import etree from librarian import OutputFile diff --git a/src/librarian/builders/txt.py b/src/librarian/builders/txt.py index b796c9b..8302de5 100644 --- a/src/librarian/builders/txt.py +++ b/src/librarian/builders/txt.py @@ -1,6 +1,6 @@ -# coding: utf-8 -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import io from librarian import OutputFile, get_resource @@ -59,7 +59,7 @@ class TxtBuilder: "Wszystkie materiały dodatkowe (przypisy, motywy literackie) są " "udostępnione na Licencji Wolnej Sztuki 1.3: " "https://artlibre.org/licence/lal/pl/\n" - "Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania " + "Fundacja Wolne Lektury zastrzega sobie prawa do wydania " "krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich " "i prawach pokrewnych.\nWykorzystując zasoby z Wolnych Lektur, " "należy pamiętać o zapisach licencji oraz zasadach, które " @@ -78,7 +78,7 @@ class TxtBuilder: "Wszystkie materiały dodatkowe (przypisy, motywy literackie) są " "udostępnione na Licencji Wolnej Sztuki 1.3: " "https://artlibre.org/licence/lal/pl/\n" - "Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania " + "Fundacja Wolne Lektury zastrzega sobie prawa do wydania " "krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich " "i prawach pokrewnych.\nWykorzystując zasoby z Wolnych Lektur, " "należy pamiętać o zapisach licencji oraz zasadach, które " @@ -169,7 +169,7 @@ class TxtBuilder: funders = ', '.join(meta.funders) if funders: - funders = u"\n\nPublikację wsparli i wsparły: %s." % funders + funders = "\n\nPublikację wsparli i wsparły: %s." % funders isbn = getattr(meta, 'isbn_txt', None) if isbn: diff --git a/src/librarian/command_line.py b/src/librarian/command_line.py index 7b7eb38..08c769f 100644 --- a/src/librarian/command_line.py +++ b/src/librarian/command_line.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import argparse import os.path from .builders import builders diff --git a/src/librarian/cover.py b/src/librarian/cover.py index 9cd813a..a3bd5cd 100644 --- a/src/librarian/cover.py +++ b/src/librarian/cover.py @@ -1,17 +1,13 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import re from PIL import Image, ImageFont, ImageDraw, ImageFilter -from six import BytesIO +from io import BytesIO from librarian import get_resource, OutputFile, URLOpener -class Metric(object): +class Metric: """Gets metrics from an object, scaling it by a factor.""" def __init__(self, obj, scale): self._obj = obj @@ -25,7 +21,7 @@ class Metric(object): return src -class TextBox(object): +class TextBox: """Creates an Image with a series of centered strings.""" SHADOW_X = 3 @@ -108,7 +104,7 @@ class TextBox(object): return image -class Cover(object): +class Cover: """Abstract base class for cover images generator.""" width = 600 height = 800 @@ -216,7 +212,7 @@ class Cover(object): author_font = ImageFont.truetype( self.author_font_ttf, metr.author_font_size, - layout_engine=ImageFont.LAYOUT_BASIC) + layout_engine=ImageFont.Layout.BASIC) for pa in self.pretty_authors(): tbox.text(pa, self.author_color, author_font, metr.author_lineskip, self.author_shadow) @@ -230,7 +226,7 @@ class Cover(object): ) title_font = ImageFont.truetype( self.title_font_ttf, metr.title_font_size, - layout_engine=ImageFont.LAYOUT_BASIC) + layout_engine=ImageFont.Layout.BASIC) tbox.text(self.pretty_title(), self.title_color, title_font, metr.title_lineskip, self.title_shadow) text_img = tbox.image() @@ -244,7 +240,7 @@ class Cover(object): img = img.resize(( int(round(img.size[0] * self.scale_after)), int(round(img.size[1] * self.scale_after))), - Image.ANTIALIAS) + Image.Resampling.LANCZOS) return img def mime_type(self): @@ -306,22 +302,22 @@ class WLCover(Cover): format = 'JPEG' epoch_colors = { - u'Starożytność': '#9e3610', - u'Średniowiecze': '#564c09', - u'Renesans': '#8ca629', - u'Barok': '#a6820a', - u'Oświecenie': '#f2802e', - u'Romantyzm': '#db4b16', - u'Pozytywizm': '#961060', - u'Modernizm': '#7784e0', - u'Dwudziestolecie międzywojenne': '#3044cf', - u'Współczesność': '#06393d', + 'Starożytność': '#9e3610', + 'Średniowiecze': '#564c09', + 'Renesans': '#8ca629', + 'Barok': '#a6820a', + 'Oświecenie': '#f2802e', + 'Romantyzm': '#db4b16', + 'Pozytywizm': '#961060', + 'Modernizm': '#7784e0', + 'Dwudziestolecie międzywojenne': '#3044cf', + 'Współczesność': '#06393d', } set_title_color = True kind_box_position = { - u'Liryka': 'top', - u'Epika': 'bottom', + 'Liryka': 'top', + 'Epika': 'bottom', } def __init__(self, book_info, format=None, width=None, height=None, @@ -387,7 +383,7 @@ class WLCover(Cover): ) author_font = ImageFont.truetype( self.author_font_ttf, metr.author_font_size, - layout_engine=ImageFont.LAYOUT_BASIC) + layout_engine=ImageFont.Layout.BASIC) for pa in self.pretty_authors(): box.text(pa, font=author_font, line_height=metr.author_lineskip, color=self.author_color, shadow_color=self.author_shadow, @@ -404,7 +400,7 @@ class WLCover(Cover): # Write title. title_font = ImageFont.truetype( self.title_font_ttf, metr.title_font_size, - layout_engine=ImageFont.LAYOUT_BASIC) + layout_engine=ImageFont.Layout.BASIC) box.text(self.pretty_title(), line_height=metr.title_lineskip, font=title_font, @@ -508,7 +504,7 @@ class WLCover(Cover): cut = 0 else: cut = (resized[1] - trg_size[1]) // 2 - src = src.resize(resized, Image.ANTIALIAS) + src = src.resize(resized, Image.Resampling.LANCZOS) src = src.crop((0, cut, src.size[0], src.size[1] - cut)) else: resized = ( @@ -516,7 +512,7 @@ class WLCover(Cover): trg_size[1], ) cut = (resized[0] - trg_size[0]) // 2 - src = src.resize(resized, Image.ANTIALIAS) + src = src.resize(resized, Image.Resampling.LANCZOS) src = src.crop((cut, 0, src.size[0] - cut, src.size[1])) img.paste(src, (metr.bar_width, 0)) @@ -671,7 +667,7 @@ class LogoWLCover(WLCover): logo.size[1] * widths[i] / logo.size[0] * L_scale )) ), - Image.ANTIALIAS) + Image.Resampling.LANCZOS) if self.logos_right: cursor -= logo.size[0] @@ -694,7 +690,7 @@ class LogoWLCover(WLCover): draw = ImageDraw.Draw(img2) author_font = ImageFont.truetype( self.author_font_ttf, metr.annotation_height, - layout_engine=ImageFont.LAYOUT_BASIC) + layout_engine=ImageFont.Layout.BASIC) draw.text((self.annotation_height, self.annotation_height), self.annotation, font=author_font, fill='#FFFFFF') img2.show() img2 = img2.rotate(90) @@ -884,7 +880,7 @@ class PrestigioCover(Cover): title_font_size = 50 def pretty_title(self): - return u"„%s”" % self.title + return "„%s”" % self.title class BookotekaCover(Cover): diff --git a/src/librarian/covers/marquise.py b/src/librarian/covers/marquise.py index 830c7b6..6f33b32 100644 --- a/src/librarian/covers/marquise.py +++ b/src/librarian/covers/marquise.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.Image from librarian.cover import Cover, Metric from .utils.color import algo_contrast_or_hue, luminance, is_very_bright diff --git a/src/librarian/covers/utils/color.py b/src/librarian/covers/utils/color.py index afcf38e..f42f8b6 100644 --- a/src/librarian/covers/utils/color.py +++ b/src/librarian/covers/utils/color.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# def luminance(rgb): rgb = [ c / 255 diff --git a/src/librarian/covers/utils/textbox.py b/src/librarian/covers/utils/textbox.py index cc9c501..e82bee4 100644 --- a/src/librarian/covers/utils/textbox.py +++ b/src/librarian/covers/utils/textbox.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.Image import PIL.ImageDraw @@ -18,7 +21,8 @@ def split_words(text): def text_with_tracking(draw, tracking, pos, text, fill=None, font=None): x, y = pos for c in text: - width = font.getsize(c)[0] + # TODO: adjust for kerning? + width = font.getlength(c) draw.text((x, y), c, fill=fill, font=font) x += width + tracking diff --git a/src/librarian/covers/widgets/author.py b/src/librarian/covers/widgets/author.py index 4060999..381b7af 100644 --- a/src/librarian/covers/widgets/author.py +++ b/src/librarian/covers/widgets/author.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.ImageFont from librarian import get_resource from librarian.cover import Metric @@ -18,14 +21,14 @@ class AuthorBox(Widget): author_font = PIL.ImageFont.truetype( get_resource('fonts/SourceSans3VF-Roman.ttf'), self.m.font_size, - layout_engine=PIL.ImageFont.LAYOUT_BASIC + layout_engine=PIL.ImageFont.Layout.BASIC ) author_font.set_variation_by_axes([600]) translator_font = PIL.ImageFont.truetype( get_resource('fonts/SourceSans3VF-Roman.ttf'), self.m.font_size, - layout_engine=PIL.ImageFont.LAYOUT_BASIC + layout_engine=PIL.ImageFont.Layout.BASIC ) translator_font.set_variation_by_axes([400]) diff --git a/src/librarian/covers/widgets/background.py b/src/librarian/covers/widgets/background.py index fd8c764..98adf05 100644 --- a/src/librarian/covers/widgets/background.py +++ b/src/librarian/covers/widgets/background.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import io import time from urllib.request import urlopen diff --git a/src/librarian/covers/widgets/base.py b/src/librarian/covers/widgets/base.py index 9c56693..f28fc67 100644 --- a/src/librarian/covers/widgets/base.py +++ b/src/librarian/covers/widgets/base.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# class Widget: transparency = True margin_top = 0 diff --git a/src/librarian/covers/widgets/image.py b/src/librarian/covers/widgets/image.py index 39879d4..798dfaf 100644 --- a/src/librarian/covers/widgets/image.py +++ b/src/librarian/covers/widgets/image.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.Image from librarian import get_resource from .base import Widget diff --git a/src/librarian/covers/widgets/marquise.py b/src/librarian/covers/widgets/marquise.py index 81ccf5e..de0eda2 100644 --- a/src/librarian/covers/widgets/marquise.py +++ b/src/librarian/covers/widgets/marquise.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.Image from .base import Widget diff --git a/src/librarian/covers/widgets/title.py b/src/librarian/covers/widgets/title.py index 7d070ca..d5a6334 100644 --- a/src/librarian/covers/widgets/title.py +++ b/src/librarian/covers/widgets/title.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import PIL.ImageFont from librarian import get_resource from librarian.cover import Metric @@ -21,7 +24,7 @@ class TitleBox(Widget): title_font = PIL.ImageFont.truetype( get_resource('fonts/SourceSans3VF-Roman.ttf'), self.m.font_size, - layout_engine=PIL.ImageFont.LAYOUT_BASIC + layout_engine=PIL.ImageFont.Layout.BASIC ) title_font.set_variation_by_axes([800]) diff --git a/src/librarian/dcparser.py b/src/librarian/dcparser.py index 2edba6c..1d3c2f3 100644 --- a/src/librarian/dcparser.py +++ b/src/librarian/dcparser.py @@ -1,11 +1,11 @@ # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from xml.parsers.expat import ExpatError from datetime import date +import io import time import re -import six from librarian.util import roman_to_int from librarian import (ValidationError, NoDublinCore, ParseError, DCNS, RDFNS, @@ -20,7 +20,7 @@ from librarian.meta.types.wluri import WLURI from librarian.meta.types import text -class Field(object): +class Field: def __init__(self, uri, attr_name, value_type=text.TextValue, multiple=False, salias=None, **kwargs): self.uri = uri @@ -103,7 +103,7 @@ class DCInfo(type): return super(DCInfo, mcs).__new__(mcs, classname, bases, class_dict) -class WorkInfo(six.with_metaclass(DCInfo, object)): +class WorkInfo(metaclass=DCInfo): FIELDS = ( Field(DCNS('creator'), 'authors', Person, salias='author', multiple=True), @@ -150,7 +150,7 @@ class WorkInfo(six.with_metaclass(DCInfo, object)): @classmethod def from_bytes(cls, xml, *args, **kwargs): - return cls.from_file(six.BytesIO(xml), *args, **kwargs) + return cls.from_file(io.BytesIO(xml), *args, **kwargs) @classmethod def from_file(cls, xmlfile, *args, **kwargs): @@ -301,11 +301,11 @@ class WorkInfo(six.with_metaclass(DCInfo, object)): for x in v: e = etree.Element(field.uri) if x is not None: - e.text = six.text_type(x) + e.text = str(x) description.append(e) else: e = etree.Element(field.uri) - e.text = six.text_type(v) + e.text = str(v) description.append(e) return root @@ -320,9 +320,9 @@ class WorkInfo(six.with_metaclass(DCInfo, object)): if field.multiple: if len(v) == 0: continue - v = [six.text_type(x) for x in v if x is not None] + v = [str(x) for x in v if x is not None] else: - v = six.text_type(v) + v = str(v) dc[field.name] = {'uri': field.uri, 'value': v} rdf['fields'] = dc @@ -337,15 +337,15 @@ class WorkInfo(six.with_metaclass(DCInfo, object)): if field.multiple: if len(v) == 0: continue - v = [six.text_type(x) for x in v if x is not None] + v = [str(x) for x in v if x is not None] else: - v = six.text_type(v) + v = str(v) result[field.name] = v if field.salias: v = getattr(self, field.salias) if v is not None: - result[field.salias] = six.text_type(v) + result[field.salias] = str(v) return result diff --git a/src/librarian/document.py b/src/librarian/document.py index 6cdf191..aa6f37f 100644 --- a/src/librarian/document.py +++ b/src/librarian/document.py @@ -1,8 +1,11 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import gettext import os import re +import urllib.request from lxml import etree -import six from .parser import parser from . import dcparser, DCNS, DirDocProvider from .functions import lang_code_3to2 @@ -10,7 +13,7 @@ from .functions import lang_code_3to2 class WLDocument: def __init__(self, filename=None, url=None, provider=None): - source = filename or six.moves.urllib.request.urlopen(url) + source = filename or urllib.request.urlopen(url) tree = etree.parse(source, parser=parser) self.tree = tree tree.getroot().document = self @@ -32,10 +35,8 @@ class WLDocument: @property def children(self): for part_uri in self.meta.parts or []: - yield type(self)( - filename=self.provider.by_slug(part_uri.slug), - provider=self.provider - ) + with self.provider.by_slug(part_uri.slug) as f: + yield type(self)(filename=f, provider=self.provider) def build(self, builder, base_url=None, **kwargs): return builder(base_url=base_url).build(self, **kwargs) diff --git a/src/librarian/elements/__init__.py b/src/librarian/elements/__init__.py index 3e8e63f..b08c3e1 100644 --- a/src/librarian/elements/__init__.py +++ b/src/librarian/elements/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from lxml import etree from . import (blocks, comments, drama, figures, footnotes, front, headers, masters, paragraphs, poetry, ref, root, separators, styles, themes, diff --git a/src/librarian/elements/base.py b/src/librarian/elements/base.py index 8e83311..863436c 100644 --- a/src/librarian/elements/base.py +++ b/src/librarian/elements/base.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import copy import re from lxml import etree @@ -39,11 +42,11 @@ class WLElement(etree.ElementBase): STRIP = False text_substitutions = [ - (u'---', u'—'), - (u'--', u'–'), - #(u'...', u'…'), # Temporary turnoff for epub - (u',,', u'„'), - (u'"', u'”'), + ('---', '—'), + ('--', '–'), + #('...', '…'), # Temporary turnoff for epub + (',,', '„'), + ('"', '”'), ('\ufeff', ''), ("'", "\u2019"), # This was enabled for epub. @@ -113,11 +116,11 @@ class WLElement(etree.ElementBase): newt = '' wlist = re.compile(r'\w+|[^\w]', re.UNICODE).findall(text) for w in wlist: - newt += builder.hyphenator.inserted(w, u'\u00AD') + newt += builder.hyphenator.inserted(w, '\u00AD') text = newt if builder.orphans: - text = re.sub(r'(?<=\s\w)\s+', u'\u00A0', text) + text = re.sub(r'(?<=\s\w)\s+', '\u00A0', text) return text diff --git a/src/librarian/elements/blocks/__init__.py b/src/librarian/elements/blocks/__init__.py index cb98bc6..47f7d59 100644 --- a/src/librarian/elements/blocks/__init__.py +++ b/src/librarian/elements/blocks/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .dedykacja import Dedykacja from .dlugi_cytat import DlugiCytat from .nota import Nota diff --git a/src/librarian/elements/blocks/dedykacja.py b/src/librarian/elements/blocks/dedykacja.py index 6cb68c0..4076541 100644 --- a/src/librarian/elements/blocks/dedykacja.py +++ b/src/librarian/elements/blocks/dedykacja.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/blocks/dlugi_cytat.py b/src/librarian/elements/blocks/dlugi_cytat.py index 22e98dd..0a55833 100644 --- a/src/librarian/elements/blocks/dlugi_cytat.py +++ b/src/librarian/elements/blocks/dlugi_cytat.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/blocks/nota.py b/src/librarian/elements/blocks/nota.py index 0e3f61f..8a8d8bd 100644 --- a/src/librarian/elements/blocks/nota.py +++ b/src/librarian/elements/blocks/nota.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/blocks/poezja_cyt.py b/src/librarian/elements/blocks/poezja_cyt.py index 14cd539..2b351ca 100644 --- a/src/librarian/elements/blocks/poezja_cyt.py +++ b/src/librarian/elements/blocks/poezja_cyt.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/blocks/ramka.py b/src/librarian/elements/blocks/ramka.py index b85f83f..5501d4f 100644 --- a/src/librarian/elements/blocks/ramka.py +++ b/src/librarian/elements/blocks/ramka.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/blocks/wywiad.py b/src/librarian/elements/blocks/wywiad.py index 8f9a5ae..321d204 100644 --- a/src/librarian/elements/blocks/wywiad.py +++ b/src/librarian/elements/blocks/wywiad.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/comments/__init__.py b/src/librarian/elements/comments/__init__.py index 86ecb17..d56def9 100644 --- a/src/librarian/elements/comments/__init__.py +++ b/src/librarian/elements/comments/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .abstrakt import Abstrakt from .nota_red import NotaRed from .uwaga import Uwaga diff --git a/src/librarian/elements/comments/abstrakt.py b/src/librarian/elements/comments/abstrakt.py index 887712b..09be8ae 100644 --- a/src/librarian/elements/comments/abstrakt.py +++ b/src/librarian/elements/comments/abstrakt.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/comments/nota_red.py b/src/librarian/elements/comments/nota_red.py index 0ce970e..8f34ee8 100644 --- a/src/librarian/elements/comments/nota_red.py +++ b/src/librarian/elements/comments/nota_red.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/comments/uwaga.py b/src/librarian/elements/comments/uwaga.py index 8bd56b4..498d968 100644 --- a/src/librarian/elements/comments/uwaga.py +++ b/src/librarian/elements/comments/uwaga.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/__init__.py b/src/librarian/elements/drama/__init__.py index c1cc601..882d8fe 100644 --- a/src/librarian/elements/drama/__init__.py +++ b/src/librarian/elements/drama/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .didaskalia import Didaskalia from .didask_tekst import DidaskTekst from .kwestia import Kwestia diff --git a/src/librarian/elements/drama/didask_tekst.py b/src/librarian/elements/drama/didask_tekst.py index 088e373..8d242a7 100644 --- a/src/librarian/elements/drama/didask_tekst.py +++ b/src/librarian/elements/drama/didask_tekst.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/didaskalia.py b/src/librarian/elements/drama/didaskalia.py index 11ae486..ed43cae 100644 --- a/src/librarian/elements/drama/didaskalia.py +++ b/src/librarian/elements/drama/didaskalia.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/kwestia.py b/src/librarian/elements/drama/kwestia.py index 56463d6..c493968 100644 --- a/src/librarian/elements/drama/kwestia.py +++ b/src/librarian/elements/drama/kwestia.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/lista_osob.py b/src/librarian/elements/drama/lista_osob.py index 8895aa8..0727698 100644 --- a/src/librarian/elements/drama/lista_osob.py +++ b/src/librarian/elements/drama/lista_osob.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from lxml import etree from ..base import WLElement diff --git a/src/librarian/elements/drama/lista_osoba.py b/src/librarian/elements/drama/lista_osoba.py index c5770ee..e4243df 100644 --- a/src/librarian/elements/drama/lista_osoba.py +++ b/src/librarian/elements/drama/lista_osoba.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/miejsce_czas.py b/src/librarian/elements/drama/miejsce_czas.py index 8908bea..313109c 100644 --- a/src/librarian/elements/drama/miejsce_czas.py +++ b/src/librarian/elements/drama/miejsce_czas.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..paragraphs import Akap diff --git a/src/librarian/elements/drama/naglowek_listy.py b/src/librarian/elements/drama/naglowek_listy.py index 2f3eec4..646833c 100644 --- a/src/librarian/elements/drama/naglowek_listy.py +++ b/src/librarian/elements/drama/naglowek_listy.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/naglowek_osoba.py b/src/librarian/elements/drama/naglowek_osoba.py index b3f918e..dde0c0c 100644 --- a/src/librarian/elements/drama/naglowek_osoba.py +++ b/src/librarian/elements/drama/naglowek_osoba.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/drama/osoba.py b/src/librarian/elements/drama/osoba.py index ffd9494..832a062 100644 --- a/src/librarian/elements/drama/osoba.py +++ b/src/librarian/elements/drama/osoba.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/figures/__init__.py b/src/librarian/elements/figures/__init__.py index 42b8015..c3d1c48 100644 --- a/src/librarian/elements/figures/__init__.py +++ b/src/librarian/elements/figures/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .animacja import Animacja from .ilustr import Ilustr from .tabela import Tabela diff --git a/src/librarian/elements/figures/animacja.py b/src/librarian/elements/figures/animacja.py index a32f9e0..3479a02 100644 --- a/src/librarian/elements/figures/animacja.py +++ b/src/librarian/elements/figures/animacja.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/figures/ilustr.py b/src/librarian/elements/figures/ilustr.py index 9b3b165..33099f6 100644 --- a/src/librarian/elements/figures/ilustr.py +++ b/src/librarian/elements/figures/ilustr.py @@ -1,4 +1,9 @@ -import six.moves +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# +import io +import urllib.parse +import urllib.request from PIL import Image from ..base import WLElement @@ -11,12 +16,12 @@ class Ilustr(WLElement): def get_html_attr(self, builder): ## TODO: thumbnail. - url = six.moves.urllib.parse.urljoin( + url = urllib.parse.urljoin( builder.base_url, self.get('src') ) - imgfile = six.moves.urllib.request.urlopen(url) + imgfile = urllib.request.urlopen(url) img = Image.open(imgfile) th_format, ext, media_type = { 'GIF': ('GIF', 'gif', 'image/gif'), @@ -29,7 +34,7 @@ class Ilustr(WLElement): else: th = img.resize((width, round(width * img.size[1] / img.size[0]))) - buffer = six.BytesIO() + buffer = io.BytesIO() th.save(buffer, format=th_format) imgfile.close() file_name = 'image%d.%s' % ( diff --git a/src/librarian/elements/figures/kol.py b/src/librarian/elements/figures/kol.py index c94f20d..9b425de 100644 --- a/src/librarian/elements/figures/kol.py +++ b/src/librarian/elements/figures/kol.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/figures/tabela.py b/src/librarian/elements/figures/tabela.py index ba02b20..737166f 100644 --- a/src/librarian/elements/figures/tabela.py +++ b/src/librarian/elements/figures/tabela.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/figures/wiersz.py b/src/librarian/elements/figures/wiersz.py index 2c7d91a..c5d355a 100644 --- a/src/librarian/elements/figures/wiersz.py +++ b/src/librarian/elements/figures/wiersz.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/footnotes/__init__.py b/src/librarian/elements/footnotes/__init__.py index e18eaae..76be8e8 100644 --- a/src/librarian/elements/footnotes/__init__.py +++ b/src/librarian/elements/footnotes/__init__.py @@ -1,6 +1,6 @@ -# -*- coding: utf-8 -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/front/__init__.py b/src/librarian/elements/front/__init__.py index 44e7a99..82e80ad 100644 --- a/src/librarian/elements/front/__init__.py +++ b/src/librarian/elements/front/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .autor_utworu import AutorUtworu from .dzielo_nadrzedne import DzieloNadrzedne from .motto_podpis import MottoPodpis diff --git a/src/librarian/elements/front/autor_utworu.py b/src/librarian/elements/front/autor_utworu.py index 736a24c..555cb92 100644 --- a/src/librarian/elements/front/autor_utworu.py +++ b/src/librarian/elements/front/autor_utworu.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import HeaderElement diff --git a/src/librarian/elements/front/base.py b/src/librarian/elements/front/base.py index 90ec348..04d286e 100644 --- a/src/librarian/elements/front/base.py +++ b/src/librarian/elements/front/base.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/front/dzielo_nadrzedne.py b/src/librarian/elements/front/dzielo_nadrzedne.py index 5f114bc..bbc30b1 100644 --- a/src/librarian/elements/front/dzielo_nadrzedne.py +++ b/src/librarian/elements/front/dzielo_nadrzedne.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import HeaderElement diff --git a/src/librarian/elements/front/motto.py b/src/librarian/elements/front/motto.py index 48eac66..ab6d13c 100644 --- a/src/librarian/elements/front/motto.py +++ b/src/librarian/elements/front/motto.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/front/motto_podpis.py b/src/librarian/elements/front/motto_podpis.py index 4b2ee0d..3441263 100644 --- a/src/librarian/elements/front/motto_podpis.py +++ b/src/librarian/elements/front/motto_podpis.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/front/nazwa_utworu.py b/src/librarian/elements/front/nazwa_utworu.py index 4d06b47..376b932 100644 --- a/src/librarian/elements/front/nazwa_utworu.py +++ b/src/librarian/elements/front/nazwa_utworu.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import HeaderElement diff --git a/src/librarian/elements/front/podtytul.py b/src/librarian/elements/front/podtytul.py index 71e28a8..e602571 100644 --- a/src/librarian/elements/front/podtytul.py +++ b/src/librarian/elements/front/podtytul.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import HeaderElement diff --git a/src/librarian/elements/headers/__init__.py b/src/librarian/elements/headers/__init__.py index f3bda2b..d5292fe 100644 --- a/src/librarian/elements/headers/__init__.py +++ b/src/librarian/elements/headers/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .naglowek_czesc import NaglowekCzesc from .naglowek_podrozdzial import NaglowekPodrozdzial from .naglowek_rozdzial import NaglowekRozdzial diff --git a/src/librarian/elements/headers/naglowek_czesc.py b/src/librarian/elements/headers/naglowek_czesc.py index 9caceb0..9ce9ebb 100644 --- a/src/librarian/elements/headers/naglowek_czesc.py +++ b/src/librarian/elements/headers/naglowek_czesc.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/naglowek_podrozdzial.py b/src/librarian/elements/headers/naglowek_podrozdzial.py index a7328f5..26c8049 100644 --- a/src/librarian/elements/headers/naglowek_podrozdzial.py +++ b/src/librarian/elements/headers/naglowek_podrozdzial.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/naglowek_rozdzial.py b/src/librarian/elements/headers/naglowek_rozdzial.py index 7492da4..65194d3 100644 --- a/src/librarian/elements/headers/naglowek_rozdzial.py +++ b/src/librarian/elements/headers/naglowek_rozdzial.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/naglowek_scena.py b/src/librarian/elements/headers/naglowek_scena.py index e4e0fd1..eb2c356 100644 --- a/src/librarian/elements/headers/naglowek_scena.py +++ b/src/librarian/elements/headers/naglowek_scena.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/podtytul_czesc.py b/src/librarian/elements/headers/podtytul_czesc.py index 405f2d6..6b8ed75 100644 --- a/src/librarian/elements/headers/podtytul_czesc.py +++ b/src/librarian/elements/headers/podtytul_czesc.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/podtytul_podrozdzial.py b/src/librarian/elements/headers/podtytul_podrozdzial.py index d6fc2ec..bf3fcfe 100644 --- a/src/librarian/elements/headers/podtytul_podrozdzial.py +++ b/src/librarian/elements/headers/podtytul_podrozdzial.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/headers/podtytul_rozdzial.py b/src/librarian/elements/headers/podtytul_rozdzial.py index e30a5e2..ac455c3 100644 --- a/src/librarian/elements/headers/podtytul_rozdzial.py +++ b/src/librarian/elements/headers/podtytul_rozdzial.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/masters/__init__.py b/src/librarian/elements/masters/__init__.py index 2fdb6a6..d4f3cf0 100644 --- a/src/librarian/elements/masters/__init__.py +++ b/src/librarian/elements/masters/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/paragraphs/__init__.py b/src/librarian/elements/paragraphs/__init__.py index d6c8438..723c34f 100644 --- a/src/librarian/elements/paragraphs/__init__.py +++ b/src/librarian/elements/paragraphs/__init__.py @@ -1 +1,4 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .akap import Akap diff --git a/src/librarian/elements/paragraphs/akap.py b/src/librarian/elements/paragraphs/akap.py index 004f8ec..9df8492 100644 --- a/src/librarian/elements/paragraphs/akap.py +++ b/src/librarian/elements/paragraphs/akap.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/poetry/__init__.py b/src/librarian/elements/poetry/__init__.py index 6eeee4a..fba1501 100644 --- a/src/librarian/elements/poetry/__init__.py +++ b/src/librarian/elements/poetry/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .strofa import Strofa from .wers_akap import WersAkap from .wers_cd import WersCd diff --git a/src/librarian/elements/poetry/strofa.py b/src/librarian/elements/poetry/strofa.py index e925571..7ce3f3a 100644 --- a/src/librarian/elements/poetry/strofa.py +++ b/src/librarian/elements/poetry/strofa.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from copy import copy import re from ..base import WLElement diff --git a/src/librarian/elements/poetry/wers.py b/src/librarian/elements/poetry/wers.py index 55cf537..edc4c7c 100644 --- a/src/librarian/elements/poetry/wers.py +++ b/src/librarian/elements/poetry/wers.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/poetry/wers_akap.py b/src/librarian/elements/poetry/wers_akap.py index c0d70f4..394684c 100644 --- a/src/librarian/elements/poetry/wers_akap.py +++ b/src/librarian/elements/poetry/wers_akap.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .wers import Wers diff --git a/src/librarian/elements/poetry/wers_cd.py b/src/librarian/elements/poetry/wers_cd.py index df1f563..49d5a6b 100644 --- a/src/librarian/elements/poetry/wers_cd.py +++ b/src/librarian/elements/poetry/wers_cd.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .wers import Wers class WersCd(Wers): diff --git a/src/librarian/elements/poetry/wers_do_prawej.py b/src/librarian/elements/poetry/wers_do_prawej.py index 81af0d6..b3c8ae9 100644 --- a/src/librarian/elements/poetry/wers_do_prawej.py +++ b/src/librarian/elements/poetry/wers_do_prawej.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .wers import Wers diff --git a/src/librarian/elements/poetry/wers_srodek.py b/src/librarian/elements/poetry/wers_srodek.py index 2e95db3..b8088c5 100644 --- a/src/librarian/elements/poetry/wers_srodek.py +++ b/src/librarian/elements/poetry/wers_srodek.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .wers import Wers diff --git a/src/librarian/elements/poetry/wers_wciety.py b/src/librarian/elements/poetry/wers_wciety.py index 662e57a..8fbd175 100644 --- a/src/librarian/elements/poetry/wers_wciety.py +++ b/src/librarian/elements/poetry/wers_wciety.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .wers import Wers diff --git a/src/librarian/elements/poetry/zastepnik_wersu.py b/src/librarian/elements/poetry/zastepnik_wersu.py index edee0f7..5aa740e 100644 --- a/src/librarian/elements/poetry/zastepnik_wersu.py +++ b/src/librarian/elements/poetry/zastepnik_wersu.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/ref/__init__.py b/src/librarian/elements/ref/__init__.py index 7a72a38..fc89a55 100644 --- a/src/librarian/elements/ref/__init__.py +++ b/src/librarian/elements/ref/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/root/__init__.py b/src/librarian/elements/root/__init__.py index 541895a..ae7705e 100644 --- a/src/librarian/elements/root/__init__.py +++ b/src/librarian/elements/root/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement from ..masters import Master diff --git a/src/librarian/elements/separators/__init__.py b/src/librarian/elements/separators/__init__.py index 84e9784..b564cd1 100644 --- a/src/librarian/elements/separators/__init__.py +++ b/src/librarian/elements/separators/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .sekcja_asterysk import SekcjaAsterysk from .sekcja_swiatlo import SekcjaSwiatlo from .separator_linia import SeparatorLinia diff --git a/src/librarian/elements/separators/sekcja_asterysk.py b/src/librarian/elements/separators/sekcja_asterysk.py index 46be85b..35bd7a7 100644 --- a/src/librarian/elements/separators/sekcja_asterysk.py +++ b/src/librarian/elements/separators/sekcja_asterysk.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/separators/sekcja_swiatlo.py b/src/librarian/elements/separators/sekcja_swiatlo.py index 28ba6e5..805078e 100644 --- a/src/librarian/elements/separators/sekcja_swiatlo.py +++ b/src/librarian/elements/separators/sekcja_swiatlo.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/separators/separator_linia.py b/src/librarian/elements/separators/separator_linia.py index 49ea17f..8874967 100644 --- a/src/librarian/elements/separators/separator_linia.py +++ b/src/librarian/elements/separators/separator_linia.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/__init__.py b/src/librarian/elements/styles/__init__.py index 9ff5118..4453490 100644 --- a/src/librarian/elements/styles/__init__.py +++ b/src/librarian/elements/styles/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .indeks_dolny import IndeksDolny from .mat import Mat from .slowo_obce import SlowoObce diff --git a/src/librarian/elements/styles/indeks_dolny.py b/src/librarian/elements/styles/indeks_dolny.py index bac93c0..774e1e1 100644 --- a/src/librarian/elements/styles/indeks_dolny.py +++ b/src/librarian/elements/styles/indeks_dolny.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/mat.py b/src/librarian/elements/styles/mat.py index fa353f9..68fcc3f 100644 --- a/src/librarian/elements/styles/mat.py +++ b/src/librarian/elements/styles/mat.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from copy import copy from ..base import WLElement diff --git a/src/librarian/elements/styles/slowo_obce.py b/src/librarian/elements/styles/slowo_obce.py index 5848aa6..b8a4bd6 100644 --- a/src/librarian/elements/styles/slowo_obce.py +++ b/src/librarian/elements/styles/slowo_obce.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/tytul_dziela.py b/src/librarian/elements/styles/tytul_dziela.py index 77852d5..37abbb9 100644 --- a/src/librarian/elements/styles/tytul_dziela.py +++ b/src/librarian/elements/styles/tytul_dziela.py @@ -1,4 +1,6 @@ -# -*- coding: utf-8 +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/wieksze_odstepy.py b/src/librarian/elements/styles/wieksze_odstepy.py index 953e797..9e30601 100644 --- a/src/librarian/elements/styles/wieksze_odstepy.py +++ b/src/librarian/elements/styles/wieksze_odstepy.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/www.py b/src/librarian/elements/styles/www.py index d8268a1..7022d1f 100644 --- a/src/librarian/elements/styles/www.py +++ b/src/librarian/elements/styles/www.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/styles/wyroznienie.py b/src/librarian/elements/styles/wyroznienie.py index 2a71a29..9906dd4 100644 --- a/src/librarian/elements/styles/wyroznienie.py +++ b/src/librarian/elements/styles/wyroznienie.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/themes/__init__.py b/src/librarian/elements/themes/__init__.py index f2278e3..6c35d26 100644 --- a/src/librarian/elements/themes/__init__.py +++ b/src/librarian/elements/themes/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .begin import Begin from .end import End from .motyw import Motyw diff --git a/src/librarian/elements/themes/begin.py b/src/librarian/elements/themes/begin.py index 2d7ddc4..f88d2f3 100644 --- a/src/librarian/elements/themes/begin.py +++ b/src/librarian/elements/themes/begin.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/themes/end.py b/src/librarian/elements/themes/end.py index 0604e3d..ccf10a3 100644 --- a/src/librarian/elements/themes/end.py +++ b/src/librarian/elements/themes/end.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/themes/motyw.py b/src/librarian/elements/themes/motyw.py index 9f6a886..efb7c71 100644 --- a/src/librarian/elements/themes/motyw.py +++ b/src/librarian/elements/themes/motyw.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/elements/tools/__init__.py b/src/librarian/elements/tools/__init__.py index ad0ab97..99f81d9 100644 --- a/src/librarian/elements/tools/__init__.py +++ b/src/librarian/elements/tools/__init__.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from ..base import WLElement diff --git a/src/librarian/embeds/__init__.py b/src/librarian/embeds/__init__.py index 821ae37..4714a92 100644 --- a/src/librarian/embeds/__init__.py +++ b/src/librarian/embeds/__init__.py @@ -1,5 +1,6 @@ -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import importlib from lxml import etree diff --git a/src/librarian/embeds/latex.py b/src/librarian/embeds/latex.py index 4c664a9..4d3f1f0 100644 --- a/src/librarian/embeds/latex.py +++ b/src/librarian/embeds/latex.py @@ -1,6 +1,6 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import os import shutil from subprocess import call, PIPE diff --git a/src/librarian/embeds/mathml.py b/src/librarian/embeds/mathml.py index 16fa75b..f633fc4 100644 --- a/src/librarian/embeds/mathml.py +++ b/src/librarian/embeds/mathml.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from lxml import etree -import six from librarian import get_resource from . import TreeEmbed, create_embed, downgrades_to @@ -24,7 +23,7 @@ class MathML(TreeEmbed): """ xslt = etree.parse(get_resource('res/embeds/mathml/mathml2latex.xslt')) output = self.tree.xslt(xslt) - text = six.text_type(output) + text = str(output) # Workaround for entities being preserved in output. # But there should be a better way. text = text.replace('<', '<').replace('&', '&') diff --git a/src/librarian/epub.py b/src/librarian/epub.py index a3931b5..7dbfc49 100644 --- a/src/librarian/epub.py +++ b/src/librarian/epub.py @@ -1,136 +1,14 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import print_function, unicode_literals - -import os -import os.path import re -import subprocess -import six from copy import deepcopy -from mimetypes import guess_type - -from ebooklib import epub from lxml import etree -from PIL import Image -from tempfile import mkdtemp, NamedTemporaryFile -from shutil import rmtree - -from librarian import RDFNS, WLNS, DCNS, OutputFile -from librarian.cover import make_cover - -from librarian import functions, get_resource - -from librarian.hyphenator import Hyphenator - -functions.reg_person_name() - -def squeeze_whitespace(s): - return s - return re.sub(b'\\s+', b' ', s) +from librarian import WLNS -def set_hyph_language(source_tree): - bibl_lng = etree.XPath('//dc:language//text()', - namespaces={'dc': str(DCNS)})(source_tree) - short_lng = functions.lang_code_3to2(bibl_lng[0]) - try: - return Hyphenator(get_resource('res/hyph-dictionaries/hyph_' + - short_lng + '.dic')) - except: - pass - - -def hyphenate_and_fix_conjunctions(source_tree, hyph): - texts = etree.XPath('/utwor/*[2]//text()')(source_tree) - for t in texts: - parent = t.getparent() - if hyph is not None: - newt = '' - wlist = re.compile(r'\w+|[^\w]', re.UNICODE).findall(t) - for w in wlist: - newt += hyph.inserted(w, u'\u00AD') - else: - newt = t - newt = re.sub(r'(?<=\s\w)\s+', u'\u00A0', newt) - if t.is_text: - parent.text = newt - elif t.is_tail: - parent.tail = newt - - -def node_name(node): - """ Find out a node's name - - >>> print(node_name(etree.fromstring('XYZ'))) - XYZ - """ - - tempnode = deepcopy(node) - - for p in ('pe', 'pa', 'pt', 'pr', 'motyw'): - for e in tempnode.findall('.//%s' % p): - t = e.tail - e.clear() - e.tail = t - etree.strip_tags(tempnode, '*') - return tempnode.text - - -def xslt(xml, sheet, **kwargs): - if isinstance(xml, etree._Element): - xml = etree.ElementTree(xml) - with open(sheet) as xsltf: - transform = etree.XSLT(etree.parse(xsltf)) - params = dict( - (key, transform.strparam(value)) - for key, value in kwargs.items() - ) - return transform(xml, **params) - - -def replace_characters(node): - def replace_chars(text): - if text is None: - return None - return text.replace(u"\ufeff", u"")\ - .replace("---", u"\u2014")\ - .replace("--", u"\u2013")\ - .replace(",,", u"\u201E")\ - .replace('"', u"\u201D")\ - .replace("'", u"\u2019") - if node.tag in ('uwaga', 'extra'): - t = node.tail - node.clear() - node.tail = t - node.text = replace_chars(node.text) - node.tail = replace_chars(node.tail) - for child in node: - replace_characters(child) - - -def find_annotations(annotations, source, part_no): - for child in source: - if child.tag in ('pe', 'pa', 'pt', 'pr'): - annotation = deepcopy(child) - number = str(len(annotations) + 1) - annotation.set('number', number) - annotation.set('part', str(part_no)) - annotation.tail = '' - annotations.append(annotation) - tail = child.tail - child.clear() - child.tail = tail - child.text = number - if child.tag not in ('extra', 'uwaga'): - find_annotations(annotations, child, part_no) - - -class Stanza(object): +class Stanza: """ Converts / verse endings into verse elements in a stanza. @@ -209,572 +87,3 @@ def replace_by_verse(tree): stanzas = tree.findall('.//' + WLNS('strofa')) for stanza in stanzas: Stanza(stanza).versify() - - -def used_chars(element): - """ Lists characters used in an ETree Element """ - chars = set((element.text or '') + (element.tail or '')) - for child in element: - chars = chars.union(used_chars(child)) - return chars - - -def chop(main_text): - """ divide main content of the XML file into chunks """ - - # prepare a container for each chunk - part_xml = etree.Element('utwor') - etree.SubElement(part_xml, 'master') - main_xml_part = part_xml[0] # master - - last_node_part = False - - # The below loop are workaround for a problem with epubs - # in drama ebooks without acts. - is_scene = False - is_act = False - for one_part in main_text: - name = one_part.tag - if name == 'naglowek_scena': - is_scene = True - elif name == 'naglowek_akt': - is_act = True - - for one_part in main_text: - name = one_part.tag - if is_act is False and is_scene is True: - if name == 'naglowek_czesc': - yield part_xml - last_node_part = True - main_xml_part[:] = [deepcopy(one_part)] - elif not last_node_part and name == "naglowek_scena": - yield part_xml - main_xml_part[:] = [deepcopy(one_part)] - else: - main_xml_part.append(deepcopy(one_part)) - last_node_part = False - else: - if name == 'naglowek_czesc': - yield part_xml - last_node_part = True - main_xml_part[:] = [deepcopy(one_part)] - elif (not last_node_part - and name in ( - "naglowek_rozdzial", "naglowek_akt", "srodtytul" - )): - yield part_xml - main_xml_part[:] = [deepcopy(one_part)] - else: - main_xml_part.append(deepcopy(one_part)) - last_node_part = False - yield part_xml - - -def transform_chunk(chunk_xml, chunk_no, annotations, empty=False, - _empty_html_static=[]): - """ - Transforms one chunk, returns a HTML string, a TOC object - and a set of used characters. - """ - - toc = [] - for element in chunk_xml[0]: - if element.tag == "naglowek_czesc": - toc.append( - ( - epub.Link( - "part%d.xhtml#book-text" % chunk_no, - node_name(element), - "part%d-text" % chunk_no - ), - [] - ) - ) - elif element.tag in ("naglowek_rozdzial", "naglowek_akt", "srodtytul"): - toc.append( - ( - epub.Link( - "part%d.xhtml" % chunk_no, - node_name(element), - "part%d" % chunk_no - ), - [] - ) - ) - elif element.tag in ('naglowek_podrozdzial', 'naglowek_scena'): - if not toc: - toc.append( - ( - epub.Link( - "part%d.xhtml" % chunk_no, - " ", - "part%d" % chunk_no - ), - [] - ) - ) - - subnumber = len(toc[-1][1]) - toc[-1][1].append( - epub.Link( - "part%d.xhtml#sub%d" % (chunk_no, subnumber), - node_name(element), - "part%d-sub%d" % (chunk_no, subnumber) - ) - ) - element.set('sub', six.text_type(subnumber)) - if empty: - if not _empty_html_static: - with open(get_resource('epub/emptyChunk.xhtml')) as f: - _empty_html_static.append(f.read()) - chars = set() - output_html = _empty_html_static[0] - else: - find_annotations(annotations, chunk_xml, chunk_no) - replace_by_verse(chunk_xml) - html_tree = xslt(chunk_xml, get_resource('epub/xsltScheme.xsl')) - chars = used_chars(html_tree.getroot()) - output_html = etree.tostring( - html_tree, pretty_print=True, xml_declaration=True, - encoding="utf-8", - doctype='' - ) - return output_html, toc, chars - - -def remove_empty_lists_from_toc(toc): - for i, e in enumerate(toc): - if isinstance(e, tuple): - if e[1]: - remove_empty_lists_from_toc(e[1]) - else: - toc[i] = e[0] - - - -def transform_file(wldoc, chunk_counter=1, first=True, sample=None, hyphenate=False, output_type='epub', spine=None, output=None, annotations=None): - """ processes one input file and proceeds to its children """ - - replace_characters(wldoc.edoc.getroot()) - - hyphenator = set_hyph_language( - wldoc.edoc.getroot() - ) if hyphenate else None - hyphenate_and_fix_conjunctions(wldoc.edoc.getroot(), hyphenator) - - # every input file will have a TOC entry, - # pointing to starting chunk - toc = [ - ( - epub.Link( - "part%d.xhtml" % chunk_counter, - wldoc.book_info.title, - "path%d-start" % chunk_counter - ), - [] - ) - ] - chars = set() - if first: - # write book title page - html_tree = xslt(wldoc.edoc, get_resource('epub/xsltTitle.xsl'), - outputtype=output_type) - chars = used_chars(html_tree.getroot()) - html_string = etree.tostring( - html_tree, pretty_print=True, xml_declaration=True, - encoding="utf-8", - doctype='' - ) - item = epub.EpubItem( - uid="titlePage", - file_name="title.xhtml", - media_type="application/xhtml+xml", - content=squeeze_whitespace(html_string) - ) - spine.append(item) - output.add_item(item) - # add a title page TOC entry - toc[-1][1].append( - epub.Link( - "title.xhtml", - "Strona tytułowa", - "title", - ) - ) - - item = epub.EpubNav() - toc[-1][1].append( - epub.Link( - "nav.xhtml", - "Spis treści", - "nav" - ) - ) - output.add_item(item) - spine.append(item) - - toc[-1][1].append( - epub.Link( - "part1.xhtml", - "Początek utworu", - "part1" - ) - ) - - elif wldoc.book_info.parts: - # write title page for every parent - if sample is not None and sample <= 0: - chars = set() - html_string = open( - get_resource('epub/emptyChunk.xhtml')).read() - else: - html_tree = xslt(wldoc.edoc, - get_resource('epub/xsltChunkTitle.xsl')) - chars = used_chars(html_tree.getroot()) - html_string = etree.tostring( - html_tree, pretty_print=True, xml_declaration=True, - encoding="utf-8", - doctype='' - ) - item = epub.EpubItem( - uid="part%d" % chunk_counter, - file_name="part%d.xhtml" % chunk_counter, - media_type="application/xhtml+xml", - content=squeeze_whitespace(html_string) - ) - output.add_item(item) - spine.append(item) - - chunk_counter += 1 - - if len(wldoc.edoc.getroot()) > 1: - # rdf before style master - main_text = wldoc.edoc.getroot()[1] - else: - # rdf in style master - main_text = wldoc.edoc.getroot()[0] - if main_text.tag == RDFNS('RDF'): - main_text = None - - if main_text is not None: - for chunk_xml in chop(main_text): - empty = False - if sample is not None: - if sample <= 0: - empty = True - else: - sample -= len(chunk_xml.xpath( - '//strofa|//akap|//akap_cd|//akap_dialog' - )) - chunk_html, chunk_toc, chunk_chars = transform_chunk( - chunk_xml, chunk_counter, annotations, empty) - - toc[-1][1].extend(chunk_toc) - chars = chars.union(chunk_chars) - item = epub.EpubItem( - uid="part%d" % chunk_counter, - file_name="part%d.xhtml" % chunk_counter, - media_type="application/xhtml+xml", - content=squeeze_whitespace(chunk_html) - ) - output.add_item(item) - spine.append(item) - chunk_counter += 1 - - for child in wldoc.parts(): - child_toc, chunk_counter, chunk_chars, sample = transform_file( - child, chunk_counter, first=False, sample=sample, - hyphenate=hyphenate, output_type=output_type, - spine=spine, output=output, annotations=annotations, - ) - toc[-1][1].extend(child_toc) - chars = chars.union(chunk_chars) - - return toc, chunk_counter, chars, sample - - -def transform(wldoc, verbose=False, style=None, - sample=None, cover=None, flags=None, hyphenate=False, - base_url='file://./', output_type='epub'): - """ produces a EPUB file - - sample=n: generate sample e-book (with at least n paragraphs) - cover: a cover.Cover factory or True for default - flags: less-advertising, without-fonts, working-copy - """ - - - document = deepcopy(wldoc) - del wldoc - - if flags: - for flag in flags: - document.edoc.getroot().set(flag, 'yes') - - document.clean_ed_note() - document.clean_ed_note('abstrakt') - - # add editors info - editors = document.editors() - if editors: - document.edoc.getroot().set('editors', u', '.join(sorted( - editor.readable() for editor in editors))) - if document.book_info.funders: - document.edoc.getroot().set('funders', u', '.join( - document.book_info.funders)) - if document.book_info.thanks: - document.edoc.getroot().set('thanks', document.book_info.thanks) - - output = epub.EpubBook() - output.set_identifier(six.text_type(document.book_info.url)) - output.set_language(functions.lang_code_3to2(document.book_info.language)) - output.set_title(document.book_info.title) - for i, author in enumerate(document.book_info.authors): - output.add_author( - author.readable(), - file_as=six.text_type(author), - uid='creator{}'.format(i) - ) - for translator in document.book_info.translators: - output.add_author( - translator.readable(), - file_as=six.text_type(translator), - role='trl', - uid='translator{}'.format(i) - ) - for publisher in document.book_info.publisher: - output.add_metadata("DC", "publisher", publisher) - output.add_metadata("DC", "date", document.book_info.created_at) - - output.guide.append({ - "type": "text", - "title": "Początek", - "href": "part1.xhtml" - }) - - output.add_item(epub.EpubNcx()) - - spine = output.spine - - functions.reg_mathml_epub(output) - - # FIXME - for i, ilustr in enumerate(document.edoc.findall('//ilustr')): - url = six.moves.urllib.parse.urljoin( - base_url, - ilustr.get('src') - ) - imgfile = six.moves.urllib.request.urlopen(url) - img = Image.open(imgfile) - - th_format, ext, media_type = { - 'GIF': ('GIF', 'gif', 'image/gif'), - 'PNG': ('PNG', 'png', 'image/png'), - }.get(img.format, ('JPEG', 'jpg', 'image/jpeg')) - - width = 1200 - if img.size[0] < width: - th = img - else: - th = img.resize((width, round(width * img.size[1] / img.size[0]))) - - imgfile.close() - - buffer = six.BytesIO() - th.save(buffer, format=th_format) - - file_name = 'image%d.%s' % (i, ext) - ilustr.set('src', file_name) - output.add_item( - epub.EpubItem( - uid='image%s' % i, - file_name=file_name, - media_type=media_type, - content=buffer.getvalue() - ) - ) - - # write static elements - - with open(get_resource('res/wl-logo-small.png'), 'rb') as f: - output.add_item( - epub.EpubItem( - uid="logo_wolnelektury.png", - file_name="logo_wolnelektury.png", - media_type="image/png", - content=f.read() - ) - ) - with open(get_resource('res/jedenprocent.png'), 'rb') as f: - output.add_item( - epub.EpubItem( - uid="jedenprocent", - file_name="jedenprocent.png", - media_type="image/png", - content=f.read() - ) - ) - - if not style: - style = get_resource('epub/style.css') - with open(style, 'rb') as f: - output.add_item( - epub.EpubItem( - uid="style", - file_name="style.css", - media_type="text/css", - content=f.read() - ) - ) - - if cover: - if cover is True: - cover = make_cover - - cover_file = six.BytesIO() - bound_cover = cover(document.book_info) - bound_cover.save(cover_file) - cover_name = 'cover.%s' % bound_cover.ext() - - output.set_cover( - file_name=cover_name, - content=cover_file.getvalue(), - ) - spine.append('cover') - output.guide.append({ - "type": "cover", - "href": "cover.xhtml", - "title": "Okładka", - }) - - del cover_file - - if bound_cover.uses_dc_cover: - if document.book_info.cover_by: - document.edoc.getroot().set('data-cover-by', - document.book_info.cover_by) - if document.book_info.cover_source: - document.edoc.getroot().set('data-cover-source', - document.book_info.cover_source) - - annotations = etree.Element('annotations') - - toc, chunk_counter, chars, sample = transform_file( - document, sample=sample, - hyphenate=hyphenate, output_type=output_type, - spine=spine, output=output, annotations=annotations - ) - output.toc = toc[0][1] - - # Last modifications in container files and EPUB creation - if len(annotations) > 0: - output.toc.append( - epub.Link( - "annotations.xhtml", - "Przypisy", - "annotations" - ) - ) - replace_by_verse(annotations) - html_tree = xslt(annotations, get_resource('epub/xsltAnnotations.xsl')) - chars = chars.union(used_chars(html_tree.getroot())) - - item = epub.EpubItem( - uid="annotations", - file_name="annotations.xhtml", - media_type="application/xhtml+xml", - content=etree.tostring( - html_tree, pretty_print=True, xml_declaration=True, - encoding="utf-8", - doctype='' - ) - ) - output.add_item(item) - spine.append(item) - - output.toc.append( - epub.Link( - "support.xhtml", - "Wesprzyj Wolne Lektury", - "support" - ) - ) - with open(get_resource('epub/support.xhtml'), 'rb') as f: - html_string = f.read() - chars.update(used_chars(etree.fromstring(html_string))) - item = epub.EpubItem( - uid="support", - file_name="support.xhtml", - media_type="application/xhtml+xml", - content=squeeze_whitespace(html_string) - ) - output.add_item(item) - spine.append(item) - - output.toc.append( - epub.Link( - "last.xhtml", - "Strona redakcyjna", - "last" - ) - ) - html_tree = xslt(document.edoc, get_resource('epub/xsltLast.xsl'), - outputtype=output_type) - chars.update(used_chars(html_tree.getroot())) - item = epub.EpubItem( - uid="last", - file_name="last.xhtml", - media_type="application/xhtml+xml", - content=squeeze_whitespace(etree.tostring( - html_tree, pretty_print=True, xml_declaration=True, - encoding="utf-8", - doctype='' - )) - ) - output.add_item(item) - spine.append(item) - - if not flags or 'without-fonts' not in flags: - # strip fonts - tmpdir = mkdtemp('-librarian-epub') - try: - cwd = os.getcwd() - except OSError: - cwd = None - - os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), - 'font-optimizer')) - for fname in ('DejaVuSerif.ttf', 'DejaVuSerif-Bold.ttf', - 'DejaVuSerif-Italic.ttf', 'DejaVuSerif-BoldItalic.ttf'): - optimizer_call = ['perl', 'subset.pl', '--chars', - ''.join(chars).encode('utf-8'), - get_resource('fonts/' + fname), - os.path.join(tmpdir, fname)] - env = {"PERL_USE_UNSAFE_INC": "1"} - if verbose: - print("Running font-optimizer") - subprocess.check_call(optimizer_call, env=env) - else: - dev_null = open(os.devnull, 'w') - subprocess.check_call(optimizer_call, stdout=dev_null, - stderr=dev_null, env=env) - with open(os.path.join(tmpdir, fname), 'rb') as f: - output.add_item( - epub.EpubItem( - uid=fname, - file_name=fname, - media_type="font/ttf", - content=f.read() - ) - ) - rmtree(tmpdir) - if cwd is not None: - os.chdir(cwd) - - remove_empty_lists_from_toc(output.toc) - - output_file = NamedTemporaryFile(prefix='librarian', suffix='.epub', - delete=False) - output_file.close() - epub.write_epub(output_file.name, output, {'epub3_landmark': False}) - return OutputFile.from_filename(output_file.name) diff --git a/src/librarian/epub/emptyChunk.xhtml b/src/librarian/epub/emptyChunk.xhtml deleted file mode 100644 index d203c94..0000000 --- a/src/librarian/epub/emptyChunk.xhtml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - WolneLektury.pl - - - diff --git a/src/librarian/epub/toc.xhtml b/src/librarian/epub/toc.xhtml deleted file mode 100644 index 21c696f..0000000 --- a/src/librarian/epub/toc.xhtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - WolneLektury.pl - - - -
-

Spis treści

- %s -
- - diff --git a/src/librarian/epub/xsltAnnotations.xsl b/src/librarian/epub/xsltAnnotations.xsl deleted file mode 100644 index 90f038e..0000000 --- a/src/librarian/epub/xsltAnnotations.xsl +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - <xsl:text>Przypisy</xsl:text> - - - -
-
-

- Przypisy: -

- -
-
- - - - - - - - - -

. [przypis autorski] [przypis tłumacza] [przypis redakcyjny] [przypis edytorski]

- - - - - - - - - - -

- -

- - - -
- -
- - - - - „ - - ” - - - - -

- -

- - - diff --git a/src/librarian/epub/xsltChunkTitle.xsl b/src/librarian/epub/xsltChunkTitle.xsl deleted file mode 100644 index fc9018d..0000000 --- a/src/librarian/epub/xsltChunkTitle.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - <xsl:text>Strona tytułowa</xsl:text> - - - -
-
- -
-
- - - - - - - - - - - - - -

- -

- - - diff --git a/src/librarian/epub/xsltLast.xsl b/src/librarian/epub/xsltLast.xsl deleted file mode 100644 index 2d70489..0000000 --- a/src/librarian/epub/xsltLast.xsl +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - <xsl:text>Strona redakcyjna</xsl:text> - - - -
-

- Wszystkie zasoby Wolnych Lektur możesz swobodnie wykorzystywać, - publikować i rozpowszechniać pod warunkiem zachowania warunków - licencji i zgodnie z Zasadami wykorzystania Wolnych Lektur.
- - - Ten utwór jest udostępniony na licencji - - - - - - - - - Ten utwór jest w domenie publicznej. - - -
- Wszystkie materiały dodatkowe (przypisy, motywy literackie) są - udostępnione na Licencji Wolnej Sztuki 1.3.
- Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania - krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich - i prawach pokrewnych. Wykorzystując zasoby z Wolnych Lektur, - należy pamiętać o zapisach licencji oraz zasadach, które - spisaliśmy w Zasadach wykorzystania Wolnych Lektur. - Zapoznaj się z nimi, zanim udostępnisz dalej nasze książki. -

- -

Źródło: - - - - - , - - -

- - -

Tekst opracowany na podstawie:

- - - -

- Wydawca: - - - , - -

- - - -

- - - - - - - -

Okładka na podstawie: - - - - - - - - - - - - - -

- - - - - -

ISBN

- - -

 

-

- Plik wygenerowany dnia . -

- -
- - - - - - - - - - -

- Opracowanie redakcyjne i przypisy: - .

- - - - - -

Publikację wsparli i wsparły: - .

- - - - - - - diff --git a/src/librarian/epub/xsltScheme.xsl b/src/librarian/epub/xsltScheme.xsl deleted file mode 100644 index 0fae871..0000000 --- a/src/librarian/epub/xsltScheme.xsl +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - - - WolneLektury.pl - - - - book-text - - - - - - - - - - - - - - - - - -
- -
- - - -
-
- -
-
    - -
-
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - -

- -

- - - - - -

- -

- - - - - -

- -

- - - - - -

- -

- - - - - -

- -

- - - -

- -

- - - - -

- -

- - - - -

- -

- - - -

- -

- - - -

- -

- - - -

- -

- - - -

- -

- - - - -

- -

- - - -
- -
- - - -
- -
- - - -

- -

- - - -
- -
 
- - - -
- -  
- - - -
- -  
- - - -
- -  
- - - -
- -  
- - - -
- - margin-left: em; - - -  
- - - -
- -  
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - „ - - ” - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • - -
    • -     - - - - - - -

     

    -     - - -

    *

    -     - - -
    -     - - - - - - - - - - - - - - - - - - -
    -     - -
    -     -     -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -     diff --git a/src/librarian/epub/xsltTitle.xsl b/src/librarian/epub/xsltTitle.xsl deleted file mode 100644 index c19a6ca..0000000 --- a/src/librarian/epub/xsltTitle.xsl +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - <xsl:text>Strona tytułowa</xsl:text> - - - -
    -
    - - - - - - - - - - -
    - -

     

    - - - - -

    [Kopia robocza]

    -     - - -

    - - - - - Ta lektura, - podobnie jak tysiące innych, jest dostępna on-line na stronie - wolnelektury.pl. -

    -     - - -

    -     - -

    - Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Nowoczesna Polska. -

    - - - - -

    ISBN

    -     - -

    - WolneLektury.pl -

    -
    - - -     - - - - - - - - - - -

    - -

    -     - - -

    - -

    -     - - - -

    - tłum. - - , - - -

    -     -     - - - - - - -

    - -

    -     - - -

    - -

    -     - - -

    - -

    -     - - -

    - -

    -     - - -

    - -

    -     - - - - - - - -     diff --git a/src/librarian/fb2.py b/src/librarian/fb2.py index 6dd1c35..2946ecf 100644 --- a/src/librarian/fb2.py +++ b/src/librarian/fb2.py @@ -1,14 +1,9 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import os.path from copy import deepcopy from lxml import etree -import six from librarian import functions, OutputFile from .epub import replace_by_verse @@ -65,6 +60,6 @@ def transform(wldoc, verbose=False, result = document.transform(style) - return OutputFile.from_bytes(six.text_type(result).encode('utf-8')) + return OutputFile.from_bytes(str(result).encode('utf-8')) # vim:et diff --git a/src/librarian/fb2/description.xslt b/src/librarian/fb2/description.xslt index 6d7383f..6afbb49 100644 --- a/src/librarian/fb2/description.xslt +++ b/src/librarian/fb2/description.xslt @@ -2,7 +2,7 @@

    Utwór opracowany został w ramach projektu - Wolne Lektury - przez fundację - Nowoczesna Polska. + Wolne Lektury + przez fundację + Wolne Lektury.

    diff --git a/src/librarian/fb2/footnotes.xslt b/src/librarian/fb2/footnotes.xslt index 2fe3d4e..6d396fc 100644 --- a/src/librarian/fb2/footnotes.xslt +++ b/src/librarian/fb2/footnotes.xslt @@ -2,7 +2,7 @@ 8!fY?&IW0yE~64i;V+I_I9Cid8|uszmzQYCx=OIG{| zE0%l#zrjZUW49aI*SB(3iF41~$DDia_1(qpkG;XKuen%SBzY1Xw@wcmW{YUi2z(9 z7|V4@m;;zcl}M)KGYz7cDz;evy4=eaXy+54lihJtTD~rVD z(2($s{Veq{4QXEYa=#LdP({%dqHcwV=#a*O0Hu9bIk-Z!vP{l$E?RE(stO-cnSGH> zLQ|;i5ssfu&5ZCI;#03Z;F3=k_bI2o8RZ>)YV4eH5<)(oG<*sXNL>NsaIprc^9cPE>I%DAWZiO`M37QK?*`Al4aFAS1losS|YqZYLQCBiOoRjAdNm;Ch*`!@|QB+ed#z} zP^gKwt2Yf01xeRr9&{#x&}#E3X$khCIzg~rnNNA~=OO5RXQdDH~Ljr_^VRHsGa&_n`-gyqMGswx>xi|yJiQI%-+Oh=z zsjB|8Kbsi3<0{U<#I6$uiDxv_4dC#rb}DoqLS)5?{bJ4l9LC?H1Rl%Q&2Im_{9R>zT`cq$){zQN;f{V&=E;>O49O0g!vu%%yQ25WJUi2i7N)k diff --git a/src/librarian/font-optimizer/.hg/hgrc b/src/librarian/font-optimizer/.hg/hgrc deleted file mode 100644 index 5945460..0000000 --- a/src/librarian/font-optimizer/.hg/hgrc +++ /dev/null @@ -1,2 +0,0 @@ -[paths] -default = http://bitbucket.org/philip/font-optimizer diff --git a/src/librarian/font-optimizer/.hg/requires b/src/librarian/font-optimizer/.hg/requires deleted file mode 100644 index 5175383..0000000 --- a/src/librarian/font-optimizer/.hg/requires +++ /dev/null @@ -1,3 +0,0 @@ -revlogv1 -store -fncache diff --git a/src/librarian/font-optimizer/.hg/store/00changelog.i b/src/librarian/font-optimizer/.hg/store/00changelog.i deleted file mode 100644 index 589167b1fc2df728c5edc96033eb3bb0e0778103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6541 zcmZ8l2{cr1*dIGHmXUoQTcR*y#u^%Hm>FZQgp{2@p{ylaWh?tSk|IgAOlU#&>}!%O z%9bJ$N#whC^6z}#_nh;4o_o*p&bhzeyxa4>5E=*#~HM3GM8xj!{D+QOfEVC)e}H^XFY$ zP)cf0Gj|V?$3=wI`CyW-A41b5$jR5wAM56Q-h-szSQ%eIVRL9vFK`^#LkUX4ReEeMyt{x;8DhZG>gw_)Rfmu=CA%Dey+^fPpQoM;X z7t&-1a^t+r&u$8|F&(s_h9Gi!2G0KhlJ&ZOU&Yd84uJ1VXbs~{D0Y0PG_-*9-d$BFnv-fa-$i7Olv zm1)Qgda>I$B$hZPk`)*2$vt$)Dt$Fgy*Hsus$sLJc3i(xx$4Gv)GPyhL^PksWtsGb zrBFc`enLx#C}0qsI^3#REvo}L8F^$K3tx>u1eo7F%sVWQ>>saY!YmQY&lMfkYpnZ? zxplzwtgG}aMS3j(aRpmAn8M0dj}vOnH}Y9|!~Z9Q{fSAh;mTrpO{;a`!iV6TjlE44%$} z)x+%f=|qUS_uD&+H%>+CRNb$!CS9*oRf$6!I$}4%Y-l9$$BpE5Lx1?fBMe-2*D=Df zMsuJe_2g6L6DbDUwT~F}$F<7zdK34?QMZCi?5dNzd3FXhf2>^>Ya4T3bCW&YlWV$? z@w>1^(|YG^{haC3Y#}C9-cpN~tPNx0%lQqymXa9Te&}ae%k3-Y?3Y818Z4`JXhzU} zJ>iw}B4k~$$NI!JY@XEc3>pQwYb6BwW{@bv&R;7HY|`12dDz>eIpYM{_pfa=U*FQ=(iR331?yhkT{OU5Q zJ9T-u=7rGZb1k03US;f0(>8yEg%SBBi{);Fhx{g^GyQO*#1z_)pNVaqPdg%21ylK9 z6-zHdHZ@kZ?pRv)8O(ca-1Iz2?{lfG;HIMKub=F#k%9ir0W^}W*I_#Ca4kK~^%EiH zwyvNax+hds;ed|Gl-<(4hW(WjkTH z%`D=yU1HHbq})|z6J$Yul*%Or@JRqb`t)D~=@&8fE&H(fKM33x)7Wghqe;qpdIZS* zvmmla4@jSz-tpbB5XM^jwC|?|U;*cctchz_vqSOvYxMPXM44Z_srZK;<&#A1gnF}P zqi!Au-)N`84|_+u$Y)5wRf-do`8E?qvL(g>-$)r)(erF)&MQ_cy1X%0|8Qq_wPxFP z&v4^TTIs+mG9TyO;0o8J=@)H!-399w_Y_SE=$6TADA%C*D z4o*@mN}_!3D3{FSz7%+N5qisP{1u$3O6Sq(31OqXOtIu@6s26fIC8}2CoL{yXK6|B zoSX!|r_QYH_4|ICu=7mVU$g9%Fi%HcoRZ(CB6#3 zKr6RJ`_Uc2i@_+NP!tMM328QI zvC`SUf}w4l2H6bKkcV%DL%{Ddv{PAR0=@(QxLJW<1Zih+7B((2IlM38-=wKcnp0@i z(*6HK>kSUtjD$l5u9_ypPEWXwt06w>+C7IaGYo}&#pXmyG1S+O&4;S}7-vJ@#X@6; znwawf+9OEmIyAItsfMy!c5f^{DsFC~HmdiQvbs0x<-RB0{t|Op3wx7UZ7qs_B4f(w zQHMuveA(ND!(~stx~I62#x3HWe-F2Qe71;Rjo}Z%Td!)@HNG!x>xy&zFPbCms?

    HjQ`K*0!VNK?*OmHx===dgQl@{;dRg#c|EpknGb-`#VYb928c5qe9Z@Orz_6vXMxlR7e)34v5 zg2)!y@S07$887R_Ifx4ZHtXxzE(jYx++Mfb*ZPR>dUB1_fcSOe`ucD3(_ta<^GNmLx6yWf zvnS`HM<0Ai|JcPEKln!U>@D$@i9ZrNb=!0$BNI8KTOt-Olm?GF6><(kWIWW|&?_su zJ1>^cZWMLLR;ddo!3rvrzaAZ+4U8w6Tw%hi=v6E1>@Z~_6{y83a}JeS0N~>RfI3*g z2x_s9YpRRov=5-~M%F-m1> z^<@jl{j(sleeX+P!gDju^i73DJ&Al~>|Zj~)}#Z!?5DACKSCuL6S)Izpm>#{Jc z@`EZ{BiRAL5$8I?`#x47`km7+Hxydl*=h3x4LmROdsX8|_RZwJoA5L0<00vjbu3>s zREkc2%l{B&R%SIW%%3~S@-ntG@KTg>LFea3Y-3iDC1w?P#2=EqJUG`OP(v!O8o6WM{#g)NzPAbJH&#Z+{z#?|h*KQ5ea^gG zVc@1WUt22ql2TT8*{SSa#VprEYy<~w_;$7Jo@*_Z+nxWYxy>k?bRW;=AGnubKXrO=IQX%qP)nzn;Fmmv>-BD z&%f0hSS@7F9n?avxtVaZMKppF6BB#g=<%F8<_^pnI7Nz-^1XKpQlVvq^F~8k!djuX z#cv2q*R|Qr=$3XDO*gRUeYG<^H41Y{M|Lr*8MUZ~&XtIq>ozM3#D;S57y|vB$5T9%Rn$;-d0!hFP?NBCe zaW~*`;LX|ElZz>dP#G3EI)=ifBB<;czk4!}*Q99u(hlCn+@j|=7c#0Vw6~5?yj^+0 zx9y^oLvzZq|L-3S7&re=&Z=u`;i?re){~1Xbr61Q3F;Qa3f5_VOP@|49y$OgNPYFV z*ZQiF`1`Ox(T+H!;@XIa=ykC1e+E#G2g@IBgT*s#6IicnH9Y#Q5vDQAv=??P=sXUk zoEn&lk9-h1Lp~aPmy#P&9(J&OZdsPTQMV9bk2h>HKIpyhRNiK&P9+gYdMwn9l(P{5h#=kjG)kj zi>{KD6;~ODM~wN{h8wDd&AjI`!h>HfQ0XyP|_+8 z?cgFedQZuTgS^G)Eha3TwB5b*Q*_BzUfB1Ftce`H)YbG0{5_wnqNyd3>pc^VYbE?h&8Mp-IhZ z(~qXF&}Hf=VnXrS+swpgj3yUb^9$1YKRpS1#M&!kqxzKZ>8jezys<7HO4{D$pD<}2 z$%k@%3HC=M+>bGEg5q1X$(qjaBo}4szRNa7=qO7X0w8|70?kAK6viq%`kRyIcvSyi6!0F)xROO(4-* zn)W^-VsRdN>shNUI6wq zd{R*B^c@!9>pxf-dYgaIOY64p^s>nBLqaepDo=K>rhq^m0~i3ndjK9#+pVm<$e~1I z?fK_FCCHoC+r^we|Gz^LAwh>d5;$#qdv!q!Q8-{Bjxr3NY2qN^BHD{^?go4HGo3AV zhf`6~8O@Zur17n1)>qBRYiP=S%Jquoj(>$z9QRy^g8oF;tlX5{ADbrLfi6J?M4RC1m0xif-;e7Ja& ze|!3TK$EoZOv#qw1_P41`f=1!d4gx$JOKO$-~)waNwb(8e?qd)=}J*6P9oCV!iLJI ztq&Ync}%fKBKRQ#p?5!qMkJgtuNn0u)Kgr(h|;ICHOVT3{_Y!$th{@+#o2rgpXPkT z$|pwUw5^`n+YG->DTDsb;M&(`_rmOEFWk{CpYSH9Z=4ZZJSvfvc?f;iNevZ&dhBGh z=<_a@&{_UoNz&>i-C>@D!1K{+*bUP0u`7ANAu*}~#}&}dug#ay6a<%)fk7M5=Ymc zi@de1Wxox(!d~Ag-qomhIdNgdLoAyV;Jd>}`It^CKBj+C-QIUA+1@1U3k6N=5b`fc zGRc#0%7oWF8#YVa?|_-_(y$#nN*yGeW>j7wfCo=epcL@bDhNs$%8%$%R%hOqtas*V zEzpndC=O`^a{uhVQ->)Y{R~-)F*3!gm>8>|Rf%X7;~FC+6keHtHZ>*~o2V$Gh^Bbs z|1MA#lrc(Z3`P~Hq-+jcp3Ko)l5aJ;p@FyyX^jIfPh3h2+Q3Vb;G*ZoB?i#!U}*Ut zai~E_tZa7hXUIOE$PJJJXBU+Sc(VvH7e0Ux$ehdl@G~XdmRpB|GY0>>rPwUWX-wGSt0Y3P;W$Ko-!pRAt4eKMUs+;GG&O6GK7qo zq6`g`GM4Cn@5{Gu>$m>vd)K=A+`+UwmXYX_FeK0r-4*Pwe!2-2)4g0lqc+6>T z^x?TCn#L}jfgd#g!BIT9=N}!Y3^LzuU}Rxy1fx)pbTS!F#G-LD8Wup4i8wTXqoQzl z5`h4K6#x;1rjpSdjHjWtU>y1|*v@#yJ?u9H)M%OJ8|}>t$eGX>gs!Dt16QwNfy9;$ zqd1Xu)@j7swUSS(>wEM`BicAUHX<;>glZOd2^+}~JJr2I=>wZdYxKsd>u5rPsfUPg zh5Y24yuaF~vXGkWH(pV{R<1>A)Ssw%qP4m4?c4nMw3XJ4{@Ia@#^8ZG$`?61#{*X- zr-p^|thnm@6t$Jl=BzXcoN{!Z{q=L#pj_3Y8Ts)=ql zv^I=LRrwe#}-nh72clo(A8G-lT zOC#jYZBKuXrH;x>T@LuTXxGW&vRAvQJL+}S-5iG)^4>Cq2JTQy>~lbN_jq;Ai$mynxi4cDJqh{Z`|%87<4c%Qp?TtjV0kx z_o|fMu@BiU!D{(e@AZ?7^DizZd50cq9IM#7-V_V~i{oz>Tq73p$|eUIF}rA}0eZf@ zVl8a_>tc45DyNSj@T7sASBUBj7{39TL}pCWg#bj`Ho`K31) zoD;Q|4WP)21+fI>g)G`>d%kS4_EP2E?smcOby4;8W~a!(p$IpjU;UfB8t>h&`Mww4 zX|^lhp=aQj{^WVQMJW}#xeDpOSFy^~Ecqlq9vh$3g zO-9zN8u{g;aKAlATu;?~|GGRKQ)r=X=0Q6GPq3rwd_V8cbB8LbX;W$F$sY9MsD}Of zDru$riVu~H?_O5&I8~BbXZVqLRFMW>u6R@FrO-eV)6!Ov8;Rm!os(&jiPq|{@o*jC zXj>xW`b%xA4k;?N&FvmeDeON_qbFvP=Cc(lPd_G}98qJlC<+MAGdn9jE&cw;9_H(a zOOofQrPK0)^+RoH;_|^m^9avdDjwn&{o|?oZIB#7y%jN!*CQ~w4}!EvY-lOv=VrQ^ z@sITG)ZTvWv}Bd0k~3a+@?q)GMk93oxUWW{y52ZUV!JS_$v0F&LSC73OUSJI&XLb+ zjp=fiQyN3-F2v<}$>xfdE2_ucuHbWcwEX#Ph9tiDh9hUr)N|WM2eG#AhD-ypIARAL zo{INi3EGG>-{aqC^vYWQLZgYehnp^5fOUVj)nK2oSUaa%)RXnH1KXT#QxHYF%^xqz z@HGt|GxMAp3c#yM<@8rQ(a^N;v?8#bp1C8RVX)G2M%K4%#^t%l8F+!NUwQ18^-dsv zLBdq({@a+dy9Z-9UYykrM_ipaNt@z-%E2L6HgDl?rPbN;b;3pc8SXMiTaR|-2qim4 zpoDEx_KiuIRYbw*1bsg`nQl1RwOMTB7zPyG`lVpN{W%86!%G#zv-ziPGD&Gpm9MthUq z6CFe@e{Wzsb0p8TH921QOU>cW_ZGxlOzU@*v|7c73@2GO)|GA3D_|RkH6}UhGxN%0 ztmy1K^>#g9gjRhf+|PNlekyQW9f4hTJI(9sUA-qSVdyZsgk$T;_+%bBpZuhdwAX{3 zCR)S!1INOTbPPPM$|SD3XzYBO`svYNz9H|d$nAkkYZ-SAfBMQNpdFGad8fd{vwSU6 z%lvuwsp1wG1*3b*)BaR%`}tK-PTmyQfi4o#XyS;ZVdHe}lms&CzD@B^hEQLCn`xR~ok4x4a^4g8uj3rU(UVU~Sx1<@ zkunVRSQF-s=gSN|`jB=-;0n(k`;w)MhF^7ENf+gX?%LlBMK*PqS|6zDj6aubsQc1s zg=J=U-Rqp23ZEq=;d+LtZ60y0zQaWga{5;TrkorOsMoA%9ani*mP@~@JKNym7x>ZY zM`EI~%aK%Z4yTL)^_tqgF5YNFC8uu@N;mtqd)7m?@{iKPx5nCX4MH4F`v#9mZWGuc zdD2q3QS>+<+lD>9AfB~N`B|^OA1TSaI>jz`M4Uv0R||1d#r7#vS+8gU%wN?f z`Wv;Y6uy7_)WFo1;PrBq_bu>_+h!YAfz%@zs&lTJ9$DNOtuh_U!&=E-xp-!5+v14fArIB6fJ(#tc-h!%MGlsxNo$rVw%mn>n?Kl>52_n(HIPWLToSlIr2U@g@& zEq%7;LDx|Cedjn&kqmMshG5dv5RPv?OWyYc=kzT3&|%lFZ$E}nc$2OPaDSBLVe7TY z+@&JlV#U497-?c~`Pqujb}1#X9kuG=$Bth}$tI1G&I=mL6V*;ndxr{z?@c}=*IbzL zUE~^TgrPo1$lGiR^{|)t$(&nGriVWaP5VW;i(bncN#kUGmB4J3c4pQ%hc}>0kLat+ z^seKc@}|Gf539ZVV0PmNA2D}%358zgzh&L<6k!sFJ1I)1vaGCq+^6RtvGS}bm3(Ew zy&xk<;*h~YXT5!j+{6y2Cz~ItO!gkB=}EcP*zaIq1$apJX@rv%n7cdLcS=LQl7>~N z%y6Tbr1E`n?0H>N>WyIUG`=T#bNZR)Y zA9TEX5~*3&+q7|}DQ5rE%gxA)6wVc1=`44u7t1|6B_^F`Yf*%?cYdRDd;!HF*r93k zk!bO?hNd{FWPymM5v-Hai)@4J+@T465q>KxOH*s}RcQ&KxxlJ$V#Xvj<$Ysky^_R$ zcZv-4>B7(N?=GE_RS?zAEZDfq^7-LeHlEntccTas<)hQ#{#|btCjDx3lD=!h@vo)% zCl?nF7$@}ze2Ca-`h4M%ri_&ELz#5VsPn;D_8#jsUkI^sPJSI6V$y?LtkVnB&ue2> zC)|5B?W*^$O}^o5T~dU$ksN`LgbTu8!at!a@L&Q@IJ5)ZKmY613xTfcbK@-oPx|Fs z+5BK?42>;uBFi+VRWOn3g(#mq1ZAiR{yOzi;$ROh`oW7j@xy_Xmm|Q+Iu+` z796pXCq#I2c4o!1GJB?dFuBWmC0tZ;<(eM13|5ZAf#Ztjc~!^ui#3k+xxhrf!Q!C1gG^w-#BXVoi*ja%`#DZnOkK0qhYU|=ogAb&E3cr zyVni7gbWgd)66U$EZN2%9X$Q%f%;YR;F8(Qu2l7KRkf}|# zJqOkoqRf2STU!>tk<=~DoZzF=rbe}d8yxRx@43ayJR_GjE2uyF<)oTM_vG<_FdvD? zS3{i5b9`b3@`nYp*Pc4*&o<^Rw!Yqrc;m+pxrQ^2;UI8VFT&X0gLm7&lL_)^rhlG< z^?};L?=%I3!1J$i{yS_n7}|e?@N;l1z!L_z)4Wv!X#s%&YQD!|0EI-S6R0#2kw!)m zsc13^MFMbWG6hScQIG^O0f|Hs&@>9;y@IoiVJ-(Gplumu2Fq;_!I#%^yEOz0`D+Q^ zli}($_x+wVm~QDXiW6B{9gW;ikz8jdvozo;*1KBck2PLl$&?CCJJ ziLMOoEpZ}C{6ag}KLpEa7Do=-(;qcSRlP7F>b$!g^M1ob!vl|=pY0+gVGIm0e0B9= zNsE0e1?P%AxK~eBTicwyR~~la)`Z!BO5?3PiCOw$0X%IE`Le^c@fB-yHFxux*z)@u z{_>N0oJB#g_o9t_^;%jdywKxL7aOad=Y1LYwOSxmXi%OaCZB#9+1DYYB2#KuakJ=I zj%E$-*ILXqh>@F>K^pm2=eC12EKui4Dmr-k9xKx`Y-4`dY#!vOU(3#7Xm5!VS==3^ zeBj{0bo;NsVx^uZsT?xtVlqGS;`H`ZF_c-U47Xx^B+LmmQB&iRQGLTla;!EaD)|#< zs)Egh5WUH}SAAc`7(MbxYsgGIU+(-4=DP+LYZ_l@nzdcM@AK|Q%&TtYSS8`n3!N&1 zXd#7LdoF3(82czRNv6PMKSK=MF$|Khzu=+nY=_{}RhFw`0z#vV^`hRGaJ^xW^6%Wi z6U#6f`WFYp#}09HI>~dcIgE!`N(8pPiu`=I0#PE%(B2Z@2qwOOVhgsK&Ep|+B6$rF zwJYcJP|ZnreB8x5@k$533VYtVxE%(-*3>gTt%%Kz)JOoabu$}qrAw;!a}OQPs9;Oo zq2zMax9#TJPJP*In8o`{pQ$y;nGGHzRV7bD3&Vp$r#S=Mn-%O!3o^qCe_lDMJTJqD z8=hYb3X{LUIl&qZ2z=8^9urz)m$eQ4-b~1;%#hiA#pQ2s@EUR+G#xb<4zy*AV&HH8 zQE?;^3XMb|K?h<9C@hME1~Aa@p{W=w4NU{@FnBzMz!*nfV}{|sF}T1QP6)%7WiYz@ z4xdnMuwj7Ug;V3#yqmch+W(6Gz@VTg00l?D(n$my8Jt`gA_0vSpW5ncGx3&e#J#JU$A0Ph`aZvt}|L0>yuf2^xjMl86K<8IMNc=~Nm( zr{U2AG!jRk)2LV+o{B~xsQ?*Zj0qx_VG+vg|6uTfH9QaoW?L7L?S_r5#nI`QZ^O2Y z7?0KDf7*x2Kbc+EnvvP}4W(w~xx*D6kk5jd9e^_XX2_FBC^uF{)p;G$c%$P`2jxai zmF}2SeTNyRTkbY?iUsB`W30{XBEV{12%Z)^U@7xKM_${k#NmvPfp0M$Q35^l z*YO`d1n>a3hoJyqR8g@+A`$?|NHU#>M&s!eIu_j4&@p5>8jE50kni{4><4`~yk(vb zED;dK$wMm947N*Xs}X4T#|MG% z9k3k4>|WtsQcD$}OHBea?dHNQ9Y%2?OFl`@TOY+`SU0m>iy8Ypc+PMx9BwfoS78^= z^p-V#G4O>V`-2nLdOCVx4I(g!w2iLs*m~Z|$HT(GW3HQ0GgF<&Kx6YbH*!!2>T;X- zUFW6Zhh^}!1j!>&KV4e~4z$i6{q)(NnZ$nS(EGwvgKk4rL)2u;eo@o?uluY%@9p&b zrh|J_pIp1L-;{2Q>v}{`GUDJ5Yp1<1cW|F$sUF2!_UPbxAXt6}1~TaIKm8Pds-b>T z_*KaPxL>Eo;LJu-&$6A=M{C|NwEqZ^;g17&l!)XLGosOmvu>^2ABoLvGWWp+m_WAm9mP6a|Z?gVPa< zClY8RB!LPLa8x3l5eNcm44aTUAU8nA4)7F$FiLYdv$q{zZeDIX)>4r`#NJDnA~7`n zh(F_^`EMZ5!JPxNZy{r;7$OQwrhu)Y!8MNv&VK@dgu;N)fhB;e9~}!|DZtjgMIe}A z6kPRoS!|i#36?t`j`g1ps}|3)z34VJzR$rMu+FPfoB9WValzmK=Lk&Q%ZKVo5B)b9 zabyA=AmQ;?D(D6j1&_ibkzg`KkpVE}0wgj(#e*2=t;r!!%P~9Pa@Lm|gnD-myu^(nvjnWIqS*MrJv1{>}GPM5{|1md^L>z?% zW=9;IKtuy*6hJ0X02H{Bq+kI88uSAa+`thrzxQy0zYRx$-Z-~qeHU1YKp5THh>T66 zg3I@|Q$^^XU2mvx2^{;E09t6|+fh7B(g@w2(y^K66Dtxmu%;Ik?k}h@KeX41d zSHF1V&^qC$ctAMQmF7pSq&J>^apR_djUmx+XF~42w`CjVIxX^Y@eqpO3kDE0wg15v z1#5Oe_$5xETt%wSLKe->>rF3?kF=PyjWV?V75^3KG%^8&K@({x3I+qZ42m@r9*riT z&_oIejieE%R2mM6#WF%n2wGWSu)jIPzR0?a!LkA*qLbx?kGEJo4S^if{Eqtd#3?6& zcbEF))~a?#;Li38fe)XddcQ(hzz~NquXFBEvg#UHoisA{9p`&jj$n8_8Z!&X$^8j z!89i+Ric)aQb?S~&FJo+8=)!;t1>i>L0r66mbE8dC`J{a^!f>-#iEpJ8kT41qF-jprMVK~tE7Ix%V;Q@L7~{shr(FaSBo_TSFPri`PRaClJH zpG|>tp%r-8cSbJd;3z9cTa~z0V6vc-k_zwJA11rcnf_Y*@8AGyu*kVNwq@<}s1x_x zCTzlNL4sd#E^M#kmTYzu@BZ-Ezs`N%n}{}X8lUAA?NWk$qiJ?2PTWhs?o+QXma~HG zU+fs?P{@?2vPUpMajNiN&w++PtgWaG_P0BhVuYTXJ9 zcawRm(dF*E&{-5d-FP-}H26aU>^1oVW{TKpqSGag=EoMy<`%i&0&J#pcIXsVpD*_q z7)dJ4!w+~*eik0f{jNltP%Nckv~q_eM!sdl1$JZa{ySz{6<$K!>*-TAU(35HO%z5s zE}i~yHE6-H!fA|&g_IjX!a0U_#Hm^f-~c)394=xf+}M#q9Y0utNi%7bCQyGFz+I349jd+<)>hq*yqxo)7kus-#u`4QW|m zyjNszJy>1~f|Fs_AI0fHNlq19$+Y@toQr=d*-G;%FmSZnMM)p3s*M4g!guoKLM?K^W)97$vEH}DKH6C3owI|jqlkwu@O|vfKxh9y zQ;je>*or5H@}*ajj*ROpPiC^@0}F5SN_m2z1*h5pEGzh}H7Cxb#Xe*(v%X?5YOE@! zEi}}EV3ntm6KzU#D<)f;wpkdJ{Ls*Q)cE?$or_SR4$x_5+YF0*@>#yHu!Y;`S+8}5 zlHT#WgOnJF{IY%;Hsu9;JBMy7E z|2&FmWa?l8NLbLCNy>XKFg-A@S-m4Oy=XDAJ+%D{EU&(5))Gxj=;jr>=_AYCzK$mD zDYTlZlf0f^v4wZK+0rSY?VJh8f6eX3Pvmg03XsY-+&!uGDE)o3*RG`UG?Aq`BoNS^ zxf^_$yq9r(0p5$y*1S>x0QDtb<~E(F*1cNQ*srLwJNA8G^Jd2x1H!fEnrJWXmjz$} z@mzq<&dt?JM9#z3+1Aq2Ru**W0^+W`u!{!fR|)`NzF?Be2FH2RcLAK?L#%Q*rW&p4 z*H1bhVe#6PF!U+2dh)C@J#bxv&OmbI--?6H20!yNo#R`>MT4rPOZFV@Me)Ns z5{w;I^o{?y-@Z3g>`l&3xE}M?Eg^LFp6Wtv4=@;^Y67+Lppe-W-nmjG;V<4BWsts8pkU=T5 zI!y)YYo09bmgawI0Cfgv)85Cm-4c@IawvX<=!uj`7fy~gg{u0{H@wqu6^~G}Pd$Ce z`W*#07?z8oY%{V^z~>#_vq>f5Roo*=4o`>faBX{2;M5!evdLic73EeF6;cudFT51* zvwC21)E4wJq}Y`sBXLCXsWNr|P>kG1@F9`2`;LvoQr#&E{()Zc{~W`lOq%>t+b3a7 z_B6xPVWCNpb`0>|J19xM=i`R22GlsYnjabqKhx0d;wF2ft7lroEh7@jQlb#!IT-D> z5~wfizq1sy-R41UvS8C-f6`_=?y5O$EUHOt<~_vDq?T7Q%ylmH=LC7wk4IGL&PCkK zeq5Fq^{tpa(M3GI3%rZkJy+(wmzQb4z>gpp_`Z}FD1cGz^@16EFW3$&{^A@{=sLzQcApXkUeKIi-`J6ZVbwjIfH^ z%8}RR%4Nvu;R%Pyyq3UxJ`{TExqaXqD%Om?|GTfq|9oNyk` zU;lUrGU4;-V&}Dy*Pbi7T%W}>3}!K>r?qvs6hID1F9WH)R#G}vLW8n>ZKGt;At1{# zrOxzYUl6;HEd#DNNx?2d!90LkLG|MV`eSZeYilc2B$)X}G;>Wa>vD?tXx+LMhCv$8 z5g!!iNGU_%Kut%3U@2!w`6vpAW(yG+M+u6mYNClyw4hk;kh;MzQ4j*D8J!&Jfr>&V zgrz3>#MCCep=yIfsJh4my`W}qkH&eT)Zsm;j- diff --git a/src/librarian/font-optimizer/.hg/store/data/_font/_subsetter.pm.i b/src/librarian/font-optimizer/.hg/store/data/_font/_subsetter.pm.i deleted file mode 100644 index 5d17c4e0fadbd4c76c5799f128e0945c087da903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20611 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/_font/_subsetter/create-data.pl.i b/src/librarian/font-optimizer/.hg/store/data/_font/_subsetter/create-data.pl.i deleted file mode 100644 index 5ba74517d9dbfc842d449ce3573e32d9646811c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1430 zcmV;H1!?*K0RRC200000009&L00Dmh0000000092|NsC0|Ns9FtVGsg=WV8(`ty=( zi}46IKtI?300000000000001ZoNbU#OT$1A#qawmrXi37maHBEB^#v&?NJZnsZGl^ znYOFRZrDFGD*D;oHhK}~G6V1Nd(86|!8#)w$B7U3Nf;&7!E!qQ$}a04j`WJ2_S3i>yQ_Y@N5 ztzn(qu>nn2up*!5bLN$7v_bZK-YuR(ayPmJw1HM4#4}D#N7*5yRlL8=;DbPzz+5yT z#}1uzz&N82Z}~-1I6CmELu(;!Rz(d$wLjPF3)rS&lX2=GT16CIv{Y$A6AHZ;;D}=y zZ!`K!hd_@4;HsW5QIMjVu2saz=btXKQ0_IqeE$tgW^xw*000016aWAK00aU601NB@ z00000000dD00030|Ns9$LO2Sr?=_uWgxyI)Iq~4krG&cx00000000000001ZoW)k# zj@vd6^*$BQ9~6C=XjMo;w05@X)4IC|kYa(nqMvR{Nm!RthcNXKl7#I;Nq`# zRHyJ=qpL=PP#4ZAz-k`>i{dDm&*$q1pX_p8bI>^l0;;4aHSE#aJbHWm8cK`Iw2&pp zjag8-7G>5VInMR~uTrL28~YDCegwQu;aZd_Bsr^DqIs<_ph$8^SSc}gRul(Fc_O!! z#Bze2(7D8HS$S|;cUr>Gu_%N-fMyxE-)yA3azl)Df<&C8v)O0A8S6W9Z~eZnsS;CH z7aLJi5L&^O?ZuWtpY@^Bp?npMV1%jn05w1Bl0*}UFuf5~zlTdu6{ZM_Mf6BlaC-f1 zkmNPwd=Fl-da(|dJwnx}yk#(gRc{bso)ySCjSzp`8`FhZJs#tA@Dr8*zE3_O@b@r@ z*@iqimfLqVGAdz19YQ)lVyU(5EeU{W>J!975@`fgF_77mDc&*Ug++VQO2d-dcU2hO zpsUN`#EoEwCL+rdpwlc)1DpVfnTTA2Mbgd-4|LtyKV*-nC2`|HuA`v?9u)ki6 z0}HxrBMljlr2;N8NpBNG;pNo@HbtWghj zBNb`sqwHi+unIRD|G?`5Di04Ev+oqniqW1{QL9UPAmOZ(noRLjQyL#V2vzdEraomg zub|*%rgM093Fow9o=9wT;-!)+N|16j3DH{0m8kjXl#B3u@INw@rYyKp|71T;^L;m^ zBang_@}S>!;O@BmHE>lT)wyzmPbjoyhwcB<*aNjI2`sKBi6j z|Iq%Y3GzSC%)hRNtEm`L!NI+0m$Z}+i_GobMEL&B+A(`snOAmGiuVD9c31A4Dhd3E zN)9hcNnhWq@+xGo14_{gdgs(|1H%;(^p-pA?UmweY{N59L*47wbLfZf%UDi<3a zbXJiOUBZJ77o{g6I1j_AUtdMH`#O8tcOBUHL&bL6+-t6zx-h>X#O+(^b diff --git a/src/librarian/font-optimizer/.hg/store/data/_l_i_c_e_n_s_e.i b/src/librarian/font-optimizer/.hg/store/data/_l_i_c_e_n_s_e.i deleted file mode 100644 index d0cc9aa675514851f82e4b132f3877055dd38098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmV;{0xA6f0RRC20000000Nc(00dM30000000030|NsC0|NsBY54(9nUgToAQf1Ls zsD?%+ku9O0z57>;IPFR)ta@v22FzkLB#~p5atw(f zu0kByrig#vnZWL9D@BUtdFFl0v@s4pXS3_|I(38TgS+_JOr1Z?I$L9H!t8A0w?{D@ z+JUi!8*bj7+6YheGkkw}`2j_1J3D}`Zk_Xt6~>=!2-fvr1GL7Q!wpWp>Z55AIC^8i z9ieV3e=-R~2UUNA!T5j!?hq^6+x`R<)TqR;Gqy+*+%aA&Z?L(6Dg;;C3i+UM_2q2( zSVhu1+Rg-cimic3`IwkIk0On!I%a#IxA!Nw+Ss~F1aCt0wkD1QY+rYmhCIAKcNW)h zSD^7Reqcy?37CL@Y*={klC7JZLd zKi!QzWPPB8#>a{RA=lQOzb3JP9WTB|Ni)tg4p%lR{xNkVgxZg;>)e&1)vj+WB?>!++Q!d})xqHWsP})& zDeA8Ul=({UxDp^sC{+F?mtqMMUSd5-U?=rD-)g`P#WTH!d<8t)!!MaF6A-@(CCUKsV$K_x{=WE-ItYb^O(rc&<{wvsv{&Q-2} zL&24ni*3pk6kAo~r9k;5(q=MSDO3>~k?AR_A_n3O3n&azEg zTx3b3=p^3PkFs5OEl(0n@;yF1!*dJ*FG*;mzsRQg{4OeEzTp*pOxQs)!>c1t3C?!* zk>L^VZRGrA7%lm_jpLIsXNREI0BPbBGeYb^9A!uxe`714M~UTjr4GTu&CVs!#&AUz zIG>-PCyyB@NHlr0-Xm`*aaKyD6o44~to?avGRg|0XiNhI>mM=ojVv(m4%VUZfZ>AX~w0wbHuFvXA)wa{i_C z(l+DWi2v2ptClW(>%cmB*rNix+c9~CYnhV3DpnD59Y`A}-sK1%qBQFgD)?TkVpE?XZ?nxofF< zqp-hW1IwEhOaUj7PRC=fbaI^*AJ{a{2toe2t zQN1UHhuU9XTE&O2uRqjf#S5e;w)C0?QAuDHrK82_@?v(jVOV~Mg~S1xN#N$RQX6lP gFS#7Di<8%%4WYNB0veToY~yi($Wo5=Ke;YJ8?s<-`#h%-@i*cqti;rwB@>CtTP-8YO%rG-JeP= zh1{Clry5bggg;|CR}z!ua-LFT;-NN_WfaRYdkup(i{%epwj|N>+;UVcCB7=TrO>Vv zavIacbQS#MO$&b*&}p@h2v=7(i+RqjmHfpuLdEfka|xsbrF;Y;pTYE6?OM%^;VxjH z)EuNjFkRa!jr?&IGxpt-Tb>bhbO|eJKqzS*U?pVRVJ#X?ch%wWz}Uh=Y(ES11G<6vvq1Qev%R;%`qEpm`wbBhREpdy z;4(i1iGPi1O=@F|9&C(Km~oMCIbkPC?XcHC1;lepR*ENTLeO}SSi zkdJ#G?HNSueLq&)*X2J7>L+9fDV*Ba8Wevay`QZVK42ZC!m9_}_5fm|Y)E8Js9D(c z4~aeS#+;Y(OfTsi8aa^~=Q$(AkIQ MpQoE^a0o9K0A0Nn7ytkO diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_c_o_p_y_i_n_g.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_c_o_p_y_i_n_g.i deleted file mode 100644 index d0f0482e5da8193d6f38d3f1226f9d462956dae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3165 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 DZl@*) diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_changes.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_changes.i deleted file mode 100644 index e022e4af990876315bb8c0e181dbf5365c95edc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmZQzWME`~fO$Y_CzQ?j9}1G@oxUi);H)Jt@9)qbJU@Q0m&(aP)qtsrIikH6xeh5v zxV^9KdcR32}##;Vn&SJ4C F1pt%bU6=p> diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_m_a_n_i_f_e_s_t._s_k_i_p.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_m_a_n_i_f_e_s_t._s_k_i_p.i deleted file mode 100644 index 57b5f9dfccbd35f8e94410e407b87f8ca9ea926f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmZQzWME`~faySLFO<#r9}0floX;M?A8D|t{h-E)mRrR-OajGFHDIb@j%uGb*I@%5 zm+!mWHka16m)#9rxO&2a_@<8fh%U|8FK?!5HaTA6>E9^0w(X~te{#yh5ZASq5B^p0 zwfjo%s(11JGGW4;w%eT-vpL>7C_k}!IM17VL(G#U^Gt2d2%7aI2CU8$)<~NCip4I% xL}*3k(@jyC44=#Q>}LD@yh=svgVMb)BW=TzrfYgsS8F{LiCxF0sw-oSf&5~ diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_makefile._p_l.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_makefile._p_l.i deleted file mode 100644 index e0087070b97c47aee3d6a1dc02f440e49aac1144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1497 zcmV;~1t$6c0RRC20000000o%<01FcU0000000061|NsC0|NsB6O78r?NT-iuvVZxB6>okc%b2QKOzr(A@(~1s8ReYC%JeRLyS3M*9cK~o zKE0DX)UlA538`~12QnOtug-dZFH%xbo`Kt!m=ksfE(LS((;k_Y{l0fO{CIZIKXyi@ zV-jc_jnnfSU0_90>I_5sQF7X(0wf3!5wg2temuUo>S*#1bClnMCD9ja+{GVzKZHN>FvFJbO=X^8aut;*X#5jJ zAf6?WHdYq!R|D(BH(PgI9$oa#hfiF$_x~>w5og#Q%^ID9tKrGuLI<3OT(V-Ux`Gy? zeZexXHd-~}m=LY)X2yPeVk zZYkWNNvuFk_TZq1S9%RF0i1?0Hb{2wp-vddI?S^BUAz@}`1fxuB!m!^)xEl1ITMvJ zg@l*+a)eRUGySoS1SE?YjnP(Jfvx)Tt}1at$Z#SY2=R7hBBm8BVp>FKw19;>=t*AA zP*v2Etu}7^RFwo4P=ZA$rYw=&mTFsJEz6j3N0q0NaNk9tM1oB$yLWau9Ah;*WS1y8 z(l#!qvgQT6eQO>Mh9>4^eO~}0%f<%Qs^@*j7|GV`{A_T1bTVj=e|~&%>cGf!d!zP} zgNvh+)83it<41ILxgw3wPD@wHt^DDJxF)wGx4)i9y+TOL%fbYXkCC}{)}G^F`mB`u zWAyn@segfH7swJ8@^k>h!PU_TMquq5211}_PGita{QMrMLAg##iN54mj=!waVr%OP z{{3DvWNzlq$I_vX>qaHPeWidYy$7R=B_x*vRIbwBw328|K7J%Ut7k zt8%@xAy}$;_!ue>+?Y-jiGU7HJyLwrv1I8PmVti8(B$F~`~1rNEHQZC7GX}oQ;GTxcOg%4 z%3(-6QEP*mgUS@>9ZKLx!m*1>0?Rd3&o!kf%9=-1kNS4YQ6L7eL{hhm#u`Ov7)`;7 z!4_4AVQviaSOpMq}=KWzU_hOT%r~HWx#g z;KsEM-CrQ%N7JxKX;!9S9$?WgB3wkI7Z4ST6`McfR-pkci>sshMlb73g6H{5uaKjd z7`IFxz@LTOk1%HHFIQ1t@mwqR6yMrhQ0G?MXs{Fljj=g<6&&5g+%f(G6zEHKko(II diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_r_e_a_d_m_e._t_x_t.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/_r_e_a_d_m_e._t_x_t.i deleted file mode 100644 index 8cc6335350943170a6901669ff6730db981232b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1496 zcmV;}1t$1aRE7`?9)AFz0Q+NetWF z)(t~IOSDadA_bDNs}=q4JC~GPyX}Srfh_THcwgsS5~aVfbeisMUTN8<8*4(pKbzfj z4mt;CD=G5VG&I3sIt$7g9*!G|xPcbd(acqHR+s!?0$tjw}U)2b}33!WTMFw&*c z*-UzmcM>M=9BiBl{9zXqR=iznyWxQ#=34qb-CkYabm?~dIK^}N{-R5x+4QbUkJDFg zx-`BV&AOd~x!0ykSs_Y1*P%;`+-G=7!SCg==+aWxi!QD5;v=5022cFpSpE;F3=i5GUW`C=Lzz zRXnD)6=lLuZn3<;X+WvNiV-#{tVoa#z!fh4D%3pNIlxNaq@za{k}jNB%NKmaz|`cc zY>yOSPGDnly3(@eHy1bT_3KpYtWc(w{<6}J3P4w$YoJ(@*RQ9n(VjHO&H78nE? zM>1?AqkRGKElSu}#z;lT{I8InooMjuyLRqyL1$l2o}SxMn&ZR4DjQ3PA}%CdlP#8YFToubZqWtsE*BMaw7`9>}*W!5az zlJ#YW-BA4)XD+l{!OFnSMPb1D06O`!d~!Xwy1#A=iHu_<-RnGCQk1bNif75Id*e|Q z9v#pr1be7!h-r#Vso^({-*qCgg}g0f(v+qHtOSA@Wx&@^x#GyDbF`W}0h_nh_vk~@ z6QYR>l=^{I&&l`xzZpv7$@R_f_p?_kYJltMSwl*v*?{tsCZjO7bK zP?;*3R=6AR^@M}qgTt+?a%@7DcG2-1VuC5@)~U9gTCSo%0?ONyT@wcHXLpYi9=HdE zVep;x&nSw~&*}RqegEQ>?pe1y=arYXtP|w^p4V^R{uCuQt)ilKXGB<<1?CrUy-z)whKn{qe8yieki#-#zm+ z%D%ORyxOnyR=id{yv0Xz!k-nokue+G%?>H4I|OfjT#|El?$#&F-)|)poqn_Lar@#w zf{I?10qHfz*DBwgYf#o!>Jqen8qdPK$c@J7cO+gN;{MpS{?2O;j@5dJJNCvbonJXu w>V@y*)??3($Lwy?pTe&vvSh{o$>-(c0)q>y+KW;HrxhHKvh?@2TA2A10NCbuPyhe` diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f.pm.i deleted file mode 100644 index 8b3c87806184e48b291c2bd68d020b78adf4e98e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 490 zcmV6HM7#>4xaNZB=S|b7BJ3XC6xlto|PbHP=j99 zp-~h}{#MZI19VYMCiND)Y4kQWBC`MQK$9UueL!oUmXe>BTG zUkI5GX{~&1l<#<-fXlPYSl{GCjWMo*>0tSZvlOX$5wK@gqZ4bPQ8+bmF<3tD7{?86S@ zR)*|YKZ;kw<>P`PpAfo}?pVr{GJ6Mw$-x`o1~*dUJSr{xu8J#eo#4ObXzHm8k$R(Y gUY?00000000000001ZoV`}xZ`v>re$QWVLUe#sSi7eQT2!XetsDKJ2DC}* zgwo(Z)L>_}(-tBA_nn+J^#_06S!bhcDv*8MYlT`jK2|1 zdyaFuAl~d4t_N2`$JzCOHsA{MQhE;&$s?|Y<1aVoF7EwAI!+=82+2cV_VoJ6;{tv^ zH_tBJK`VV^p-*HOiJhl-Qc`J9$9KDK@}N_|tQ9JpDtyaptc)#F(+8-_cAw+QaqjS6 zfLxHY1_-HSup~>yS0;avJb-pyJAl9C3Yv96qM(JxoK1WBq5jiP+kJO(JG|?5RR}PS zp)x^=v=KANA!eRDgnF>RKbkB}1)`M#q5%v4}z|UW)F<^M6zkud3bUNF(DLvca zuJpK6rKpT0iK1q9P=45J_2g_tgwCbn%4b*^_AD-C5=Z2c&dAGlQ6twaS7ox2tC*-{ z3<|u1qnD$jz}(Ds_UOB}+1h;{GnS;OQOl{N=~{>9h^EXyS*y(JMp0K|qmnK55C&ye z)Kch4eb1F=VdvZq?uOUn6e;aN;}<7l0cXWU9~P0R)5fv;dfmu9Gc>d9S$;idQ<51= zq%PKRzVlELTWhE^4}uU^B*dp20?wA1_>^)UR^YRE71FsaMFiYdqSn!l9Btv{sx;|9 zLNRe+DNJ2UuCHwYR8i0?lo)fI8%@=Lx0a|Xq$qqZ^0-ZU%d|nRE!${`sy;2qG}lw6 zI?W;_`&O+5^1Dcu9&M}QH0PYeoCrdt?iyf0aUV9x8tQE{XJzVfx0lqyThFzIJ3hae zj2k9kMuL!%nX=jgPG=DyohgBE5Zu#BVqcqG`>*aTj2E0*oGXTA$uj3t1JuJ!*f&!uz@ggP3jS5wuVpthIF zSB5AiO!)Y|R%_|WIL(sPmeNEl#rm8H;Yv(uxf^a7_ao$Ex8nH9iCl^<=DDIdA#i@w@REMki)F#qF60qYmTqeg|Aa&}hAR)v~V| dNxuipHP8sh>n?Fe*kRNC-Cd6@3sH{ diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_a_a_tutils.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_a_a_tutils.pm.i deleted file mode 100644 index 81cb366f9add782a28515af824883457c2eeb1aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3920 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_anchor.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_anchor.pm.i deleted file mode 100644 index 831f79c7767022e3724809d3a8fc79ce2e8ce822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1564 zcmV+%2IKhv0RRC20000000rCt01|uv0000000061|NsC0|Ns9s?h)hh*AgGL?`|P& zGvhnXoVS($00000000000001ZoV{58PuoTm|J{GZTZEKE3jtCzP0%11&=sjbMd;K@ zlOkiE<69lu^PSUpssH!AcXxKqi3w#t3_)_fd*8o&?wQo}zPd98?~+)aoIF0hJ2|0i`#3**&={_FpD(du@n&C^7oJT6Oisx#6-=1bv?O!xcT^abARVJ zk0Gnrd=~JS32K)pJ5giX$WbSEV$3(87$n4C%FI~qnf!Zc@jH5OIfT=ktIyN z!94du;3#q7@`#KWAiWpmibklzH9NQhBwFJo`$>iru4H21xZvg4f*DiX*ax;?G1|J| z9s`jwj|bd?dE(mzKro7g6f)$pmu2Do5M6m*|+|TxsuA-k|5RNVu}FLM>!Tubhw|2Mu#KT*!}Nb(ff=dO?#DctA(V4=AY%$dwE(8Obu((=nrb_}-U z-Ujm%R(PGH+v~^o_g9n|FUKHIbOe#gQ?<5={FCI7z$Va~BZ%2IjC97ROt3!j(bRDz zOXN?AXypL@%nRu4d66qbAI2a;9-xZ)K(HvF{nh!jL>;tGEh9jk3_x?9I^|kFYW913 zLD+Yk2V6E%8f3{_r=3%=1{^~YV(sFWEAaq7RMv+;?PnijvqUVAjw@9gW=~vZZdNF5 znrDC|l)F(>CjTQ9Xa8)~#X{_s z1E`-1dL|n&@zYO6}yZS`njr%LrY7;bwV-az16>0gh%^l*pZc6Schx=vT087Dszh6<`nK^)`w!8ZBKKU@|82EOr)dlq(rTWLODo(NV~s+F3u(cx$tI*dODXMe^WtBy^fnA=cS_6~q=$GNSL+v(!5kJnhY zd`rw5+S`DrQD0SAzz}+ELSYFs-@Vq9gAH5Cb^W}ENU!$0*x`5aKl@$0&hH<)&|hoC zT)#+mp0S_c$8J^9^laNLtsdACR5Sz?I|UUx1RZRJtOaEbG|X6}^@v%?tY45XKH&@U zgX7$~_$nR4`$T-j*-t-B_0zfF(J;woLzplIAKqG1E-la0tGSn?MaE~L`X7oDagW8q Op8Sq*TKgAI!DJv#1OpEM diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_bsln.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_bsln.pm.i deleted file mode 100644 index da72a7f7be15f4e952f1530d259e9b13aeac3d4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1226 zcmV;*1U35r0RRC20000000fEv01gxY0000000061|NsC0|Ns94^3sOR+xM2EiT^V# z#HICIT~5IO00000000000001ZoV{0VZ{j!*{+?ekVp9cH1#P>h(+Rd*=@we{T3SK4 z`_NX%5C@_LhfSPvsN%oxIF1u1Q1&XVjt^1n8PCfz<7dc<%$~`dLN8#v*|hCmvw0Eu ztYsKy3rd_57<6vChEWnj9WF>jeUDM#Wa?A!7!Yt#D?51E9eo}4@9qBGAlvH?Ms{cL zwF`fDhW*aPO?QMMkJBZ*&@l1>rk4M@LAWGbEgkBT*yqY;zU^}osa3?CD}S?EsP&Bd z_kqWFrr-y`bG+&mEX%ztz}v2UeRnCMn#HISM-hel-Ap%MDabgwL&^oAXI4-*gB+2Gd>CIGmlqClRH#KBHk!<< zq958y5g$wbimr8cDy`n3PAbkhlb1!r#_&{Y*wMnNxaeyNx)T16FC^Xh8;v{o&| zFEvY>EzNJs*cPZHh`E5IW*Gm3NQOF}Ae$had-z5@+zr7EgJnuEqO{Wu%!1X%V{@Hu z&|sNuB(rFglRR`H$yi2(gFWigDAEcqYA7g0na&z(7p#n5%0TGKJHTmdwF>dBRK?A| z*EwgWZii?~v6JY(wSczJfNwO{jzDak?jyyY-nDX}Wlplx_u@Um>Mr6XVRZp*Qt^PT-Wa+^p=aH3LLG1mssBbn)$`kJ%Ju1jYE@w;=gD6s&DFww=mE$PaLl>0H7Et{J zjRt%!_}Sy@ksmot%=jphIZuw2n|k}foID+8*iX|82V_YnRdZ5^i&nBVSr?59fQ?(XfO}SYT?abhHObg>Xi5WU@f+;37g}96tB00FDyvoGBeu` z=JYAy>Jy|*^$Bt@zQXU1L4Z7!{PD^JoiTo!3=QL3z|b6F@E2Xf%@?(t;PO23{6-MY o+YJ~|ibCyULcF#`5tGRsdh-Pb!W_f*FpmfWZ781q0kCr$lw96ang9R* diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_changes.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_changes.i deleted file mode 100644 index ba56a59851a4ea027a3bf510516f5261c7e8328c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1101 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 Fzzfz8>~{bF diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_cvt__.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_cvt__.pm.i deleted file mode 100644 index c9d031384ff34023e1ca1b1172cb8a9b12292a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 725 zcmV;`0xJCg0RRC20000000NZ&00i3r0000000061|NsC0|NsADEw>N%|EFM>9?)`E zRX)~B47&;d00000000000001ZoPAW=ZsITyefL+4x~PFwi(s`+&>~Vww@8In5O}F7 zEY7QX$H}@7SR1_2FI23!DzK;|l1GG;NCp(@$qXNsh*r4q7GyU`IqT+0e-#1<= zo?WshUnI#lXv7GayLTze)E`64k!>V5+lmTSBIYbK%}|Td`nv{)nEz9uN*SN29k=>7 z*5~I?`?32PuoZk{=UCrE~2%4K#ovdRgssYDpW-(rQ$`p z4=16GvraZRYsKkL{Jf6YC zUep6`{nBF2A|^+JweN$ zO(A2`w`Z?0?u<-z-8sjg#1mtm(3BCFDSB)5M`%7!<6Ofd|Gn~5Uw{(fYItIE+wCa49~qTZ+>uCKjJw9<>& z#Wp|;xR{O(;5c%*u0Puhs3i#2OsnRUmwE=_=}Y4>qBmG!Z9{APt!oxas-K>zQRLBF3)leAq%1PP+errvtze&PyD; zg)n8Is>z1g;-qLS+!P{DE5q;`I_{$o8FqrO@$}bVq`W#jk}PVhTN4}1j_ti4yzWrU!Qy{`tOjku!c%&lF-jQ z`Z+FIfcViU@CHyrqx5xK`D@SKmYXf{l@B|o#txW31x`id7S1PcoaO~?LZNL}D3yB$ zQp@)nWfsB?!F!X#k(N`%5oaQd=!IAzj^nPP454z&X`PT0Jj-NBdkekc@rMSjq1D4K zH}uHjY?0%FqY=b7x{5s0cIRtw*_hfyrw_;q^f1Sr4#LjC>soHR7h02w;>6JJpBE`^ z5ER+7*%((816ut1^6SPVA)y`9#A%^&h}>+y->X-C&1Suy1uOrxZflimQb^$q zgEu;``<^|G{!yLU#w#+h-3y&c)^|iIs%Eh2K-Z-?fM8b+@xFuhZL>{8A{8x`ZKfX@ z9Q6GNr&^}nteAG;MhN&i@YYB=j%@42 dS-vdfbY}Nsmg37sX>7}GUA-Qr`ag-{p8MGZhc*BJ diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_dumper.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_dumper.pm.i deleted file mode 100644 index 6f21a21dced125b81f0ab571cd14f9b7ec7b371f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1118 zcmV-k1flx?0RRC20000000bTY00=q&0000000061|NsC0|NsBq$>s=AJkyU?bk~TE z3ybQ}aPG?h00000000000001ZoPAYoZ`(Ey{?1=mEY-h&4*-e@tNmm0~V#FS{ zBFzF?qAb=DDf7jik$S&`|S>Uwf{HyTezw>OPO1$W1KSl~v0GXhTu zI&dPbOP6z-lT@XsVfe=O;LltrRNYYDoQ6!!5rAp$AlK_q>jvyvn?(n#E`^gN-lYR+ zAs0oJ`GU;76>vqV@0o)HK#Z~npY&R+gz2!7s||68p!MvlNL zNtGeq3`tCmj@DT03e#1t!`8V>awr8?JDX>r2$fp!RUmQ579rNTE_Q5E8cOaQDz4GA z$Ji9*l{b~foI<>qYN=C?26)04QVn0dt^1BrH6MUfE4_G8g1|1$GFcFKh|4ZyWkIjP zy_v5lL@9_$IAd5Q>K8?#G5gdf7>9QiwkGoi?M&xcP`t3ZiQIzAi_1^f2hd&L5tb3| z!57v5GhFe)hs1buB7Y?kf;P=JI__%U0~X&2UKAU!x%NehC0vL)szj?mCYrEb8ws3v z#~2X=+bt6}WG~4wti>yCEG*aY`SoAp+q)^8k0uv50Y)snL|R|}Q)%N!n*?x5s)t8F z#l2lE*$o~ESh<0BR3H?^AtN|FgMJ6jvRs{;|Oi8cb9KMwbz z2#MQR2lSGnMl-eUnG);xo-iJEt0Tg(zdQWM zEH^ci+QYDVrc`U*-hsQPmUwI@u4nBb6cr;$H~tEsS8zY1`6jKq{v)k-{Ey z|FB}YjQcykV_}M=*G@pU3%0=N#^FS25-$ama-KVw37AR6%_i)pUX4Ukei{I&G{+Qi zvrX@AKMxODL$+OGW^ax_v7_x8QVEhdD kJ#ssmZK*^Lp{)Jm7iA*q)xp?r?_W&$*=}n80|CX2mGsyO)&Kwi diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_e_b_d_t.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_e_b_d_t.pm.i deleted file mode 100644 index b189d1c2c99b2acca52956fdb21ed8006d8eb379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2122 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fdsc.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fdsc.pm.i deleted file mode 100644 index 0cdb3e46f73c7054933df532e02305a8dbbaff15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 865 zcmV-n1D^Z<0RRC20000000SWa00;2^0000000061|NsC0|Ns9Sh+`RvhVT6=jw(=yG>|&&ima@(z{=KA#K(3s z3Au?wq6CN9rWHc`_Z=IOIIwjq7m<_W^Yxwwdrkd>E*T6muG;O{Y|w5G0_l5%Tt$oq zmoVx+^a(jJL(@1wk4ay|Yn2HJiaw)Rh!+$z1f-0$NfpWtz!dfBAD6;elX@6!w8ccx9=RB!eDscclKUxJ+yI5{mJ$0 z@H^)?8fT9|P>02wuMwWc#mj}Rh$^>Ca~8-L!VJIq5i~BL)q>5@eU!VqaFFCAhUqvj z=B+}F%_xJ_YByb|@dx${4yS48xbWpXF|;fFgk?WE{=ky4XxL>occ_rZ zukb0@l9^D|U8h(bBG(qDNFBbTp^A$QOAgm!pF=aYkg=?PV8>8lL2)d@U@_Kfi6lgu z73EE>yrDy|wP2EQMHR{lSy+-|<6uI)0|+!FC#Q!_Sve-0>8$rSpE)@f0SjY}Cofv_ zeQ%G|tIVaA{9`n6h}9*w^rfvjqOfsM-aFvbrGqupgI`<^A+ZOM?5!E^ixo@puzz3l z@c*LkEr^SmUwWjtoNne{@n#xjoI%2~S6&#pbG)@CgnY|5RT1UzoxQ^S=lpenuh%k8 rTbWpPS}@m3g z;CPq=9Y_;#a&#v<9!CA`-Ia8wlMD@MnMA&qeY6N(D;GH623mR zPA?`y_c-6TvU8(?P~vjTza~Lk*_zV1aEmnIglyC|U7hw(W)H*EzRHs^j@{`zv~_wWA_PG>8UwcyW(Z@%xAL@Y-Rxr zOt|gmk`#H<#5%B!vPIaCNgHmpDoDUD(EawN+wHpW(+PClEhaScw1rI-o)`ayO)Uo| zJqX!r*M+p=EzQwO?Q+~`U}Q7J#27qt(d^;zkSkuVtz-BZL7 zyqw9hnzhUsQ_R|-scV5@bJdVp#}A1Jxs(=EM03RIISseKpL?+*q;psqsq(hmvH5BO zCm%C%V9F~k$x}HkbaFyo*>rqXrrUnG1I?^-KP9Yk+qN1>Qp9UGKv*!4j8wPn&6({9{YBs=f44wKFMDr>G6`XH~p@Gnn^;I6wU}BDc36xGJ>u%$oP~ ztWk~#Qdk(%SHl*Xn44Z9r&+Uu4ygN|8DRn>Bl{G*{VpE~6+cmMD{KsuvudTnNqLvS zES}cxHI_#Lf}Czc+xE4s(n@0%s@5&aC|ca86v4aw{FX&ac`s&G92J}W|6vnvtAF=) z8Kz%{?zg3I&n2L{#CNz98Pnl%xoo)RGsZ%>U4hBXDzaC8pufNQ6+afok>Kz}M32I3 z3~%s5^4f8Jj|5Xb6YvLrgpY6abcWMY8HAlEUJW`h;T$*Z?|d8%h~uz`?w{gd{r>m|*vOx8nXaz9 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fmtx.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fmtx.pm.i deleted file mode 100644 index eab522eac6a85435b6df09a1b361a0148c21c67d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 848 zcmV-W1F!r50RRC20000000R&J00$QU0000000061|NsC0|NsBdAGPh%1eOJlb{Z*O zUU!Hx-aLQ+00000000000001ZoPCu|bJ{QvhVS|nJE!1yV_?Zv7qjZP8qaAq08mruw5><=lZ2WNY!U_ zQi5LNu0=@34MjTu?wFR`RiNopz;;7!T7&C;=V92n?-4TexdQx9P<*}!SR4y0u6_6$ zDGf?fF`;szKrNWdJRuXf^{-eB11UAN$8qu*&XyR88sfY*{q#Y17A zr@?yRcf^Ff*jGQ4{2xx222JLLl4XnyPcxaZT~o>QEhc=+-lU2pIW>0=WE0a~G_f2? z9$2klQs7-{czb_?RaM)_b*k>f7;CYp=cLojkjI;tISGT`oF1)aSt&{9I z;_{%WLqjoENLfdk2MPyRv8s{H4net;IL74d^mAL>IjGj~C3hZM_uykkH*sWJ5WC%D zx8?S(cgOJK2*WcIaoDPNoNpyRYTrlxbYjy86+Piv=9;|P;Q1Qz&g>kVC4OD}attyK zoD+ID;{8%VD_nu|X;0mn&Z=-(u)(pGxl&>U9E)8WcQD(yZC6F!*-QL(_~SO`ff3H2 z^thdbxdeOB5DDCH3MS0s0ym>GgVR%U7Yt5L_OY>&dUa+SOztdW&xUNsb}e6mql-0Z zmOSa>9nT3r+5cSV5aw(i$~92+_J+6X-ypOSDTImzo+-FKuI!Bysts~GGZRp(4Mq>G zez|N$0|LhWL{h}gc${g?QMKEu(rbBBNz1>P~|9*%uNzK4Qpp9=WFR?xjlUdQ-aS3I}~<+OGI1IEyq{_n!a an%!*%k>pcf1OEGvfV)hn6te#bU>_@>MUP+r diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_font.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_font.pm.i deleted file mode 100644 index 6749bda557aad6a40581abc5f4ee8bd42934bab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7998 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 AF#rGn diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fpgm.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_fpgm.pm.i deleted file mode 100644 index 7a3472b680259526bcdf105c3e0c2628d3afb9d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 806 zcmV+>1KIol0RRC20000000QO!00rs*0000000061|NsC0|Ns9c{X>t3)wou7Dn+cB z0i?r{qA3JtC#?(rF0*mWw4H}l?tsOOq13L znZ!w~CU$B&rKn=ReRoNq8ER40#J+d$?%i{oasQD=0{u*zMTWkjZ}blPlK zs11bFsH29Y!gb1>)Cwr#Vr>OA?+a^%g_YsY0)*0e6ob=L&|n0xoWqJ8Y}d~nV>xD7 zXQc1?#rrci7M|9v;mv#mji2M$9CfsDcE!d8g=&NIs9lQgkcjAZy4~*CZrWd<;Z6ny z-x!|->A#vV_77%d9Q8MbF)oe6jzRorsm{#*kwJEp) ztpu#4i$S`*M4PV)LiWl4e~snu?w_)yCGz&`o3G6R+1#QIl(79zgwEaaB~4ll9|s^_ z+%Yr)k-50d*j?_j+*v3N((VLt3%@3}^)4!gs*!X9t%emzh(w2!SbwdVBoa50keCEy>i}u~)p%>L*L%r2E0z_W7ui`nhkDRfw3|-BR_bXMd7BCqi41*w^ zph=aQ?P9+qulcxh& kFc$)D&+E4_z7C2@jXrWCqu2q*u_w|O%GNKhe`6)mlxn(yZU6uP diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_g_d_e_f.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_g_d_e_f.pm.i deleted file mode 100644 index 7ee4f49c88c7a34105bd78020dd9fba42db06ee3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 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 Y`IPdyAOBj0+oW9NZ?r`?r|!N!B_DgS?rro z#qb!K2@Hq5M8*a2)3d=z|KfUh(Yx}za}kdsspn*LcF&YFkxFGGn2u2}GzzI$Ho60+ znWU$*@0&pjwY29ko3XnTg8A6S#nh_=fzD&xp8A#e;+>3?xXQXKaV*Ov@;M#|g@q=`bE6 z%~1cN(E8$PFzjBPoWXD1{zdnfFJ}YK8=_Q&Kqx+liYcvCw3tc|+KM<1zaf3J%$H9k z?^x3ub-Z)b9Udhw1Ffb^l!?fxh)w8g(24ZJAoNKMW@ZhgJ1D98CR5nKL1^R@x+mnK zyW#KGXCx|$gMVy6)=oUoMa9fx2b~aQ?6gtnqt94>w6Dljqq{IhOHJ9M9_m1kEEDua zDrWhz6fw4+i}TN1oUyf+u)so)84<=MfpGIUnk5rWnx!&{gfE#KGV~|;s{2_^FRIY9 z0+gsmp*BR*nFkQ3cpGSGEQ2g=lOI$%l4%>w;1#S8B9>XsNz`y6QzB4e-cLIub5jYe z5mBzd6rrq(ICJDZ*0TdlG)W>hI8xRK)@WqGX`LQP%afomQIDNmB2_PuoF*7XO;jtu zDWZ`w3}eMUaSN?9gieet3Obr=v4Pm5r~keg3@sjVk?wKtXk=rD*02H)@_i7xjU|=6 zVgZvuvF|Zu<J&5-Cb-RJL&cNXM^kB)hTDQVGq7^ zfA8H4f&AfeTA-pxJ=!cmnT*nrb{^m?K@cjX7sk%qt2|BGc`hMrZbE%x$CX)JxT=&p z=hkw$8(jzs$7W{}&n?)(@iv}2c<$n}U3|9N*@itF@8Ni_vyFSp;^Lw39P=M~%U&U> zJ8^4CvzlX^|M+vVc8t{#^Lmg)(X8zv#O5R#XIkofOt`i+vz!97j5YcqRZ|XEk1f+F z9C>**Jnx;N#}56>cplPY0Q=^E$4FDdpO4Msi$S+#AC)T3jR_;Y^wicNY$IqB9Mbls z*;d|VY{8mYKT2_Qhc&;s7EIc(W}S-z3~Bkj<#}EGfNA4?W)oVL$kc`d=Xk-ccN$7p z9D^{DuG%08Y(Mgjf){!YK5;g^$AGqXHkI;5%qEG_j2z@kEM`UerMpgUFQf{&@ZJ-H zYl^vZjk*AopS77{Ex9XH(pD$5%kka8d;* zR%Md*)zQJAXgq&)+;2-;upc6++Hj02Xd2TQOzD?%0bjG2?x*=c=YtT>aX2c;aI915 zlY8kw7&z77@DTP|{OqX+LDqq+=cL$iWawy?MIeO`Ja;#7f=Q^^7;H6g3ip&YFe}^x zpJ2OHJbkLf`y#`w(te(2wHBEz^LpmdGssBGS9IE2rBiO!1>N2aw%=9wSzcL;ajl(( zXv=N*>8Fxucj2$Upk!!g={%AM04KfQ&idV75ln;*!lw&6mZn(~)lPcXxZwZne*jV0-K1-p7*ZN_=f+Vfpg% z`c?Bp%}X1qaWMDVYB9H71E~}7(RWG{ z7lTzx`M^03K5&xSSd7@$BKi%{T&w1ihw1nM_tfjkE?Y<=ueh%4seh3pVILZz(OTut zoxca*zwf64`pr6<{(m{J(9*oF<+7$Ll%gNAtXZ8@J2h*XR6vX3`j%3+ih9%0fOS;7 zPJKEohFz^+NGT}DZ5tZgslE*31;Wp74-?D!hr^)AU<>Q!UG-~;Zm~w@C9+ZqV}s3N zvs(Um&&r;N`msC5vb2(gukqn(ehc;~N-lr{RYWE4#a@#eXI{ z)Il9X?zZ9w#{SDn=0~0Dm+38Fhs#syVwSYxI*Ls9s5ybcRt*=yi+#w8mRbdxoeF4H zRVoV|SFk8gzNuansnKR3^h};63C{0{b`AE3d=SPWay5iEfBiZqw{e@-aGK+i=RPTQ zZ-(c+zUN(v)PymdEBzp2uy=R%?pTLWN2TKq45Y077lVdJ3@KkFvy}c5L$$_>LZ9kh PJT9sQWx)RcJ5Qs2uIX^y diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyf.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyf.pm.i deleted file mode 100644 index 0d9f502e7793f9866dd82e92c0890968bbbac0f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1258 zcmV-EmlMcilX zC=qRN7CMJHR~D>>iLhvCf{t0L^(#mV`Rt<}a091@jkq&d zHfgoFS~gK>mYC-1v7z$m(*R9dm}}Lv@FLKCCUz)T0b?1*_@*L(8+I;)qDaS5P0$HO zS~}3PnKoifVQqLPsf1frqc@jn3K7qZz`!wi)c1jr84P5eNo&!i&Mjmd?Pg?3!GF22 zEYh=uw}0T|0jUVyvQb;B1gPW>P&DSr_iLOEOrF zKgsWXQ6da*;`JESvkP~@Rz*pxbP+UpCR|3&L=nw<|CPkL1&N}R8%L#_qM9d&QkhHu zgn-xiBN|}k1H7gSXf=#T<2L#_e(t+P_s^{o zZQ=IhZg@Q+=6VKum;DVXT5GP*%6?_1&sOYRu*jxXBTm|k{ey@h6^LFOnOFg?XrdX` zM%kuurE|P;8SNp7(kM^4!<&N=bB0EUXr&-l3$!`N3P6&Xuz98e2KNuQ!@FKDWC*!R1=3^_p+eVLN3YvqUJr@_(9-`F zwJCp_(Y=&gJM%f9-WP9+0Kz2Q0^t3yVx1OtciT?RV?~z|Z#JYf7O_;we3wIK@Ys+~ z{Zg>9*ctfAQoD(v-#m;iZ%!R)iU_xu37A&4i;Q-UYHSX#17@qOR8CwmmQAU~;%%fa zb#&(1+(pw0<_8GS+rbyS+Mlrc`E8oE8WFZC0)=E5iw-#BWTEgbi=(|4*LLp1+s zYvD$d$=9O~XR_z{&IY5&bq%XGW7(v*XMGSOc;Y1B<^&4<%R1`+Df*V<=>Iden%PA9 z+0>BR8CG9G`cSlL2;U9_`voojy}EohmS?tV*7C_7{Kc)!4ASG4z9h7n>C_!7JVM-f z4(KS#vue3ZlXdgkBr>*@0@gb%c;Lh+IobsA9ell-zk<9t-kU+Qh`&-Oc=Wvz$bZSZ2whD)SI{GRp4 zr>gF%zIV&xvO}_H=BG~xLRa`c7h(l-*5NJdzu#)AdC zDm_=_#>oR7@9r48!sf*3{!N=#JQw=6Xa9C=WZKo)1W&m_z~y13gXnSKh8!KOGdW2t U@sp)863XC7r#!~|1Xq3m8v>_oMF0Q* diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyph.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_glyph.pm.i deleted file mode 100644 index 59cfdd543b83931ccbf35ed5dedb3d3bbfb68495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6657 zcmV+c8vf+~0RRC20000002#pm0AN-C0000000061|NsC0|NsBloRuA zadx(D;&V|FBymlVT9UHG^J;(l^#cIGmn0{-nL1TsQ6SK0^b6gM$IKnvx??Hcg+cQA z_0`q8*ROx})7j*}agHX^9d^X|@vo83ojUj(bP@6 zFfcIQo_;*JJo|8Uc5&`FR}&9v6-xU{u7(|jF zi!kt0;U%$y9mojb!K>k}xSGskk%n_Ia04-xiAW|=^uu{DgwEh$A;OW6?qH(2z4wwy zI8VgHy@Lu)5)vHY`aZP`;ZJ0bY1a(u?EK@^@%hQA_}lU2+3`>BPd_@&86Z3ydW0f? zLI{C7l|ymoMxNXEWz1vZz7_7xlf%WYUeFUV8SJ*&*ea63jilrHaY(2P+?kiSJ~WOK zHyB6@9$+RWzzQ7ReHh*1w}o$8Ov5-K5t7T#v##Anyx!@De$t z4&O_V%5xe53PL|km?a2y;sps)FHWNQ0BID9=5KBkU}=J4t5L;nhjJE4ASH~&na2`3 z_hm3nCe7{fPVb?C(Bj6j)gyR-R%=%yLa#L4BLqGGV!EE{C&OeA4kZx<3u(Lnq7N!t zkTgSR7FWYV;d{5Tj?l3;ooO=0HnrYqE)1B(3ceSYNh*Wkhmc2e341>%S0qfzdK5q&lb!tKYQj{>>? zPV9sc&;vR`Vw)~ZleEwzt!-kMslHH<2O$hG20%*COUh!DqQuCl1T`9{32Q>L9d<B*1BG^;p#WLm*WMj1lkJR6F z&M&S`Ukfl>aX5t;*&TxTjb$JsCD?#U8w8o4_r%mqwNYfOVb%aW0B-qn>40qm@NS}T znSzQZB<1cP0o4b{a^Zo_D`SJe#mIxnPKYbU6G-fYg8>^PH%J*$TOefAN;gV8RJsUY zp%H~IB(ISnmplgP1RHXSbY3&d~(_rpPudQ9q)e&Lsf*KRZ}Sk&Y`#L_vjOc5Vx1Y!b`uxJ;xBH|WF0{q7| zjxv-@V2|J_19%W?Zf35IdS^J<+7%zAZJUM?nBvE~wztXuQNYXaK1LFQZv?aAxGkbEaT9t%cgZ;qVYtK()l#^#neU-QhGOQs z1Cnx^I6wrDIW}jgMTSOdGHE$|2{>s-2_WXGj}mE38$2`^kDdlI?=}-|5?Z4%B-Ct5 zGQ~0kQ0@#!rKY4q@4$goGoU?X3DCYfWO&6K&;D9Lx6jVsoxML5%?~YZ?*+3t>jw5W zRY)2y7!)J#&l8aM7bgtiy>=xd3G)-Ub$ZeTWTM0}7$bHzwL%hb>{LVi>G-3Cl<`nE z2k`#%T(@WX=gG@{UIdPT7x5HsIU#3>Wpr=lED`e=4g_aZ2daWx`PwrxGcB6$NjRig zSR#p$RyhlaoF>r&u^G!uVJ<#heK7%*TG(zV&EsJApfOG^e#{{c#5Bm+SriUrOcWW1 zI0%SfaKP{zoPi;B#|*9r4bb6^WHurQ?o0&_?VX1LS7cDEyH;AH;X3?&IHxhX{%qp* zWkN17lr1#yVzIVeUV6?W`oogDH|dS#Zy5Sx-QakPA$90JlkwB7VX zVT@&IFk0-2Q}p>EP<75m6z1Ne^9BT!P@eg~YL>lsQwk>os;Y!she#RmxQ;Uge*-H< zT4X_{huoZn-Xb@~4=T9ka0kXU^r9qfEX`1N9TqgKL`Ioq2gGPNPf|iUi06?q-#k&H zz1J~V*`9$ZjKCiTKa-+aHdYF^dynE|tTW#mw|sH%=X@mYm{@9eoRZfmQ>@Y@Qw=}>%EaOyLIHcy-) z0nN}jMpiW|oJ1Zu&EADivyX0Vw=Ft*@V^89yF3(j5%Gy!6@1|79iP~-EkM$OSzs%J zGdY!CPp^Ktc>5844`4(TR%3)bNDk;3TE*g@_sypxPog{ihQ4obtSzo#<*7a;U<^y8 zSJ>-;<5*3_k!TVcjUvAr;;1JYaicBxJ!U$JWvN}JtGSCpQEC+ds!lxb12MeBd0>*I zqPczB7Tb65e*phIs6<==b~U#>KymK?O2whrev)BMMbD0e;tInea%aF=&=y91a|XTL zyd%0bw=)pGZ+q9O&s?E+COX#&2~q{QfO#?SaWWaokr#k0ZQqLTzQe!ZQ*Lc#bs19p zuzkCP&bROQ&C*#qhS9}*;!ZD+z*q3Qr{I7&Cz$7x6tKv99T>@kyfGA=a2{8f2rV{9 zTxe(0cHl!4-WI9@!0OG-LH0J5{s;>nmR8{m`GmjvG-#@XltM^`IiyP4Gts=2X{^CB zGq?rV#x1C@MU)-hq8>||!iZoUWEAX@*`>6Ya|wUh%BqB7DGXx* zHf`I-?sJPwJY_tfo|AK2R4^3aY|YavA(r!o`+xyw91}4N?*pptpwR#zapEO&^64p^ z29`eF6`x|6%|P14-L*MKgL)`4C&#hT1dB9<8_KV3*!+VIGzTGim`4Fu7v9Kfhn?kU zY?VR>9rb1e0vbzs+sx{K4+mAAS*_5CZ7kbh?yXh`%4+rY_zJ67U{22)OVt3?6q#w% zREb=%^=D=OTI*y3iEPV<;%r=y3oH0QaiF|StOdm6joCeN;sm|AlS9Cz$I_9pm-1W6 zMGyP`fSH=yprFluCi`&0xRu~>#NYt2$E8prK|}8nB})2I`+TOug3^~nhsL~4e4q}{ z70f;Sow^G&xM%=j3WP5o5#ENNjsJG=&8$w8nnrDl(u1b4Sk@DrR!-Q+ZBz!JMk-NJ zj*3E{C2WR5x~G1@c`*-W)Utf_8KdnVb$VHz8!gY@9{c`ySnw7C_0zlDj8KJZ*q zaWrF6io-(~UF+JO2WB`snU~fZAUe%yrbOG)=9`Bq9F{Fp^Fg=Xz9C({fpK67+SDhy z62!$|cs^deJ-xgX{{SG(tu|n;hS50rzR|YqGmvy^*#gew+mAGW=2r9Ru>F+6@~6Wi zcz6TfEhGhaJ#Hjwkk-Qis5Jl zLt9lnObqm5b+Cfnc116(k|=a-gK6p^-ANJbv~}dBwr~`^AY%Bo_v~3qls}oQICe29 zxHa^XilGBQ3+)^M2(!i#JtibE{>;}T#iBmG6F;gxFHc}l;@Lz&yZJ{K$R3 zF4hq{5HO&6!`p*OnMnUMnRxN%$i#kkolNW(rS<=VOr#sgM7mNYvcF*Y^XY9z4c0g* zhZRnW5`qqT6)z8RBLR5e15-*&@BZ+^aK_os8qqV%SS@=^?I7ww(vln#UFKCy{OQPwF15dAx-zeW06@Y_g^u^mlg8eS1DvY5h(k{RN%;EkN)BF z^%@)WYOQr_TES4OIG{~r+#1n~Z!n_Hx*>JC>v^-T)7&6mJW`;3*vOD_qLdZd%Zb*@ zjy-i`&FkEKFRPsMg>H)`%z<>)9r1ya!FH4SyReJ=JzasXix%D*Woh)MP4UZa6 zV_?njCXyq1e%||xD#T-G=b%7!$_UUvGU2wfP6w8tn@RIaaiZ@>p`-jZ>Wb-y28bVa zbB%GsT#yu`R;TC+8T4DxjKe4q<4DfL!}g8%3$pINKgZ9*rQqB;=R(RnV7MS#H)>0h zEro#|)NN*Iwr`iYvD8qkxy7S8e9n84fJmwt=OuIPhG8IYX38QLG==Czf^8wWUbqoy znevQRm;WwcZf7`w`mN14L-qB7Q>F>^X++UOr~kX}P>Wdn796ZkHmic4gSxvO~p+Q9myY+t?1Gxn>ei)I}ayODQY* zm{>iS9BOeb_VsI&|A|}-=hInfs;CjscFB{lG2z^Jbw_2zVX zX3xQKepWlwaGmw!(9nsd`(C#2V>ZZS3q5UASF>C*abu@1WuUjN<=2GtCQL7i6W)=x zE7ax{+{e(Ldwh67ZC>Gn3g9HT2}}&M#RYeE1d?|v>0KwKg&-J#a+7*kuPd5iI0oi6&i6(mOZ zrr!@2MW2ossp2(o!wSoadKD3OcW98`as^3szk4LCrK1g2G&nE5%GIy$VvE^PwR};m z>u#aNA>Qf0q+lpG-b8RM9x-CpGt0a9sYqc~L}*{0(!^M{BF)2Tx3wYe!iKu2N|I8w z)UK9RRog5(Q`Mc=smv2^h=tuct!urkpyt287kI_AS}?7OF{P@t-{o3qRV{pDr|&u0 ziCVb;PD605o_k^kBkgtc(S24Wb;?-x%J?knvD@!j*rgVB>0`00O3;+4wHCWty~Er( z0c_szwExMrFm1z@zH5la<2vL#s;V ztEh~|{)0*WZ!cOED+yJwJH?dQ8WwI0xV*%%3hqt;@Sn!Y8hcdF%5*bU?!Wp{R;Fty zu3+z%R~lEca$~^7Oz}EarWLGI-szepo;6XKO4_dDHdeFQXytmV=7S?{q2&TSF!9&U z%O8xPdLq<@*v?+N(`k3QHB(Qv5~$(vBE|1}*JzGA-TxrlTz+|osq2#c#ZN{3&MIIX z1*}38jlZdzsI2$8DMCf)xi;93nRklsy4MwwUJbhz{vN?774Kh{p%Ubb3qO>(kO#U~ z38DDGJVtf9#==I-&vI(*b zig8uS6g6wNkD3^|98~4Cf4LF8YHjyPJUpx|@o^ z{k46U*A&-u{vuCB)zh-ZyZK_xsGIxNhtX8+5ux`oA*aqdoQ8@+aWBO%3>t~qpWJK- zckFtB^90}d(!H~e{m>q4#V&QmZt5;(cqA~PQ+s?W)L>LvjI%OAj`N9r#N}&H3dhdf z!GI3Pj`az|>}G|^H9EVKb;&Zb&l;0sQ!iNXuatikvSm7fhCj!v@@7@3u>->jzTRMz zoi)I<0wx;vNqb}g6Zn4h^5yM&DV9hYmXGjeTpFmCznf|NS8W!Tu0aXHtuVl?#XdxZZCUw@C# zaZ^euj4QA0t@>!FsezhSKcZf<_=dPH46ch6xYq7_Er+~ze3i9dm#qYv(b19; zyo&54P_?RVWfmI7w>jL!MsSza+5%>mWr{@%tSfEh!GZPYby>^OoGg-nL!oY$a=Wx_ zq{*1$$f)AN*!>!_k0@wVl;y86{735Ou=|}W5n#%fDJAv7>MutI6$i<~CJ{qYf z@xsg0Zkd)|S}pCD>!~Xe@Mb!-%;+W9^{&uh`9>7$HZXjoyS(T!GTJa@TsCmj0IWVM4v*R$X$yybsk?V_ zHB?zv6-qyP|06F(XV$f6S!FyHc&e@n0=Vd#+OOW?>UC}bRg-FsQ}~8fkB7J!$eSDAC zRq!2~!fX}Ubw1IBbbK8lzf_m7;H_M<86PMH&DR%n#n6~;WTJ!bnbBd))|i~9w^Giq zaO%#)Lvu@P-)!NP44u|eG#hxH8~jneod=(kFvF8NTnJ&iif~lqbJ9x>Nm%9uO3h4SZ1C=iipzMWHG*oyWNg&5`-%;Cw;^9SKxYuXu zMz_$ftGS(lwRvt0d|d)Ur4}d_;SD+XQ>uG5D(4!mq-gV9r+EnSYpD!l4Ms!Hiff0 z2%s2;6b*bNM{yQ>*mr;Gi>j3g9jePIac8Bz;Efz-ywc8u4ruM&#Ni7Tv-=*wT9`Y( zya?|%laT}q&V_h|b3j`+tr)~phTq8yKV29WWvJ5J%m_oE@WGdO?PL(DJG$=G^~xMP z8C%7pFc?7nfUfk!+s@boI%t)nid(qZj_IpDNArL}8nufQaZM6L2`S@@JRdJ0!LCa^ zsN28tm(v(#Y!=>(H=ABIomg^WJ>FYZnboI-{ zrQ`gH_uB^ImoUBsW#wNt{Oe8Z`MY5>=6he?A6gsE@v*1wYn`PL-MR}yb9`?ggIHbQ Lh^q3x5K08AwN%~p diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_gr_feat.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_gr_feat.pm.i deleted file mode 100644 index 390bb2ddcae033f29a0478b2c8ff50375530a62e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1938 zcmV;D2W|KO0RRC20000000&Y402ZtO0000000061|NsC0|Ns9gG=*cDy#RI00h7>9r$Y)yT0+Ym1%`y{ z2g+oWSizn;a%wre9L@dq+m&Tob`oIPUS^WWl6JK(&%VeLHvG!2IUGhJ+1cs!4tI7w z#D|>i>K_)Pj-(kSscjG{1% zZUb?Rqj;Qgd{bdz+j;vt9gd7*1tygA@4> zMj^Y-Hh6r*reR{+B$R#t$&-XcE1#%mQ7ux16e;fmcFh7IlT-|u#I&SjLk*dQ<+i?(UUa3VX=g7xApy_Zrg38>xNG+k|2~g9rJI~ATBNS$OO1V zl(0)Ys*7$0mTg!~Huqv2+4ed9%G5jBgD{Gtv6?|r7zH62JBeV-$5DKr2`;AtP#hj? zYkUv&RmsDViwE!bTY5$_d>>6kvH{tnBr&X*<5+;Af?$*mHuoMJ#nhQ04?WerIP0A6 z?9g=ILp(<@n8d`ao>Oa3I9cumLk;KQc$~NhCkGo_R^eiH>Ua<~R_hB8H+Z*_Gm7LZ}4?&^@gr>?YX(R#{ z2&&s4@quNyf;xtC(^Y}u!AW#Nu}nn567fF0i zu}?FaNU>6RXA63MAk&>$uww91HfbP3kC+DHhJ}<~R4VZd62&J^KoW*N6W1s(p6@fv zBaz6D+@ih8S$%R&2^;X@h2a=lZXjID8ECd<$bh~)#3*0M42gTUiSxrUA7^0sId>mF z$}M7ePJ~w^f-;sVx~@P<@Ohd>=AR-7O45SzY=N@5~ zB5{me!hjDW48mw2BO*2q(xpI!ik@!Svr-LG-gCl0_g^!Yv~?Uo4vf3{Ls%1be#qBQTjcQc>p<@ts6sj9K3|A}* zO)$ZXU+u(3L5wM!x+^pUwO+^xr{^+59h199d3nIGy>yA=4~YZci8TFaf+D;qZzvjy zVfYSn8?sn+q2Q8!O8P#hxR)FTTWMxGGmErca8KpP((cS$l0z1<7{2m*32Oy#jU6h- zXd| zijYy9U`xZ`EmicvtZMo+ahMHKnH{bRewVanup++(ld5$TIG&QeUlF*U+kK|eroXv2 z!7Eu(F9>fCRc7;VUKvW69^ukZ#oS<1LTh!clJJ+5tc(#Atuq=+EK>e-%)}-oeAPb3 zd_qm0NLWJgqOZ@{B{wf)iq%tvjNoWiC&OZekm+quJ*xd?oq@CVdFQ0(%nER~vV8{K z$VVcl+dDYD=s8(2L!Sl$yJuW|UL9LrfO12R>NV{oSi?SI4K>ox*};jlrN{pjaMq;r zMP&J7aq3uD7;5=r4XZNlSH}3;3T`3;bdL_(G#Wq%Q%Y^rsEb_ z(mZGhLNqhOdPWPL6B=M9cmDCb;|iFOEA>j zTQxWpDg@zlG^)AjyB@=o8zoz~3SQ0PmFT;R4_({->6aA0=mo{EcscRh7ZaHU+84c# zr{}ia4w3I?7JE>~{sE!krEmHEj08)N5&Xq(9jT17H5t2Gc9(NFervozq~RXDw}oLe YxyN?IPn5i2Fyun&Lsez^5BS#NU$j!Hg#Z8m diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hdmx.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hdmx.pm.i deleted file mode 100644 index df875b22cd0901ef0b8565e185fb8f097d2deee0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1293 zcmV+o1@ig;0RRC20000000hkd01Ep60000000061|NsC0|NsB}x={a+c6L2qEAn+w z79xK0pNS#>00000000000001ZoTXN6Z{j!*{_bBfVzZm%x}~(&lTJ`7*e=~7wX_1d zx>MUjA#sSW!O6uAg+ux8H+EhK-EO}e5{YAvXP#%~@k{Ku&(4CvWyEE>J)K^*+gILl z-65nKP{%ulQU7K@$g5#EgsUiF|6;Ebf=5@(rLd$jVXmlVejQ9M#>2bm@ODJVG@u}z zc}T&HxL`sGh5=1)JW=$A4Zcu%` z4&Wq-v(asDLPN+8l)Ob8irkFA)OVoHi!U~meK>rx?*MJgCyXd-?ThS7`qN~lj0%3W-?2?6{W z{^9x73^2=Pwlx%p?7`5;W;|U!sW3>zW0FN&Il~AHxpI7QAvMF5lQ5ME^w^D7G=WoW zFo|?V>5>q9%&~Kq^gP>&+#Kala6EyV!Sw3(D-!FvsU##76ojHBJGzZg1pM=2^@fwa zje=2c=&GKYTBgdi8ZDg~^6)&t79nGN3Z0I;Zj8$aJV!bzO6tlqp`wh9#RWZUt8=v6 zfMp08`Zfma%{seIKTutIOr;U)bUC~pm|4vPv$*&SIi+qna) z3iq8R0;_ChJB$h)B1(CTm9iR~j~Y30doTLd#3GxS!mcJ35tYy_gJEy0gUsQq7{&I% zfvrvQ{JsURNK7@Xm&Xpt#XgQYmR!VW`%oF{%;F5JD;B$maAMm}`Rr`Rr9-lP@kFWA zWhUe{m2oO_3GMGenyCz!YH(Q>5zc+K@pT%sTa7a zeu)*cgbPg6N~_guX8%iRy`lt*gvQp6ZOR}jiTaciA8=t7Br!jg7*}gZ?7{ivOf7KcWrf?7AH=1XfX*c9x(zw zVV7m#u~2MLc3r)dr?)h$T)$Q^vv*5h2UJPl*Gr*{q6qLwJF;rjRZi^AyA1!hxt`IG zE-B{H!1Gtqwcb!^ECYO_0`a+W!j#sQ?W-m0K**%TR4frHNanF{Q|Dfb@zyCI0_Mva z^Y>Bw)|EKxmifQBk&&oWgqIXS& z);xdYjoO0Q+qx0$hi&dZ(>(`WIQi|(O?)p-ouj&5acO3aCj1>SZkb?e+2>v#&}p-& zUBk(#7JOp|DEk?Yqk>2c{7y8-yNl(Q`)_!)7^#cPGml<)HPFAuYsZ+78z+%?NxO=~ zGwwn8*DU|)2^Kb^WYL5PrEq;#yKt!HxlWfG#hZjJ0*SXkkA$c-t}bBBQdIu|_sle> Duwr>f diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_head.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_head.pm.i deleted file mode 100644 index 2a27c089937f81fb12af5a201b9f0683e6e1daa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2251 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 Zp9o_FKAs3C;P7CJuS0GA{sd~ibem=*IS&8; diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hhea.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hhea.pm.i deleted file mode 100644 index 2048db237647fdc180b1be908f4f4f9582ecd60b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmV+d1^xN}0RRC20000000hDS01T-B0000000061|NsC0|NsAalm%c89y*i;&2&9y3?7>E<2rJz**Px zPH|Wq!?=Gl@Vp8e+Axfz_y?&hgdqxY37S2IJlDGzOutS>ceBy$*z;zAP=J37lvpL9 z=2jS9gbv{ERB2F}MGGbu3RJ@9!WVo2A|mRX!!whDT;+Z!2CKfulVQWKMiRha9dMXzDoa5%v zlOs>WQ?N&0quyYxd8Ey9&Lr2cH-p*m_5!^;ou}IKQpFK66wzHXM}!pocxjxCrhWJo(F+mDGc!Jj$d8*CP|1I! zLY6{3BUG)00`*>tP@#e`c1mWeDrl}?9Az5j`1K6_I-K@!Q9rU&7YIvMj+}?2LeGLz zp;p3Vxl_m84_HP0K-cjnQH{6rio&JRN2~y$y^YP6 zS7_9hM^Jml?;O7Zg^1zD5;+2c@VSdrIDy(PyVw{~>lD5;jj**vpMtR_>SAmkM!4I< zrOBN}ZD-=on)sgWSt3FUj=yJzFv-i;8qx^MRKbG#7{vwDmhkZ-{YD%oQwq8z3KhkVAAQ3HXy(lHd){VV?J|DbEgId_v2k6Ft_St4 z_08;j1i$_6cBe3qyLlK$5rH>ie`ST;EEw%pA&XOu!3&z6_e~1Ti?|_b419qzj(rz9 zwlCwA0}`Ele1&RDguSz=kaobL#=&qb0}0J?&{Irx-^I95P66vuw$nlRym$;K*e!Cx0r$dq z&g$E|R!PNHl8Z>S-m0nxr7cEpAZqnCbt{yo5~BEq!iudE8d2gZ*LkZ|qYzD7t!jTp z$jQF-aO1AO`j)zJp^suriek8|iU_}ev2~)|Bavnm zE+X_1+qW~w!|dHtw$5IPLX>ZoYR*Vw&kzfDipfTIFe62ilZ=jV5}F8SNkv)}wAZ#< zJM-D{B$IhVJv(f!NRytWH{Cr|O0w$H#B?q6qmqjU-Y8ZQUD+4id#zYmxhGqAw^$K8 zXZQc~Rhu)r7P{B&j=Q_}=lT5=K0e1W-s8(Ceu;8M{~jNv6VJP0Qe(#(#%jqUu&W2V sI#VM26w9YiFy$PsPYSO|n)Xax(9I*sXTX01yini;s){$!zZ+n<5gwXty8r+H diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hmtx.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_hmtx.pm.i deleted file mode 100644 index ccebc5b493459bd9aa010bbb8af2be4611f0b9c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1622 zcmV-c2C4Y~0RRC20000000tHS01>hP0000000061|NsC0|NsBja!&|;LkkdpM7eBE z#PMyP@n5F^00000000000001ZoW)peZ`(Ey{;pqf_0q{kY^P0MHpFpIH+7o;c_|WS z8?Y7uZBY^ty|^Of#Phu0zB^KqDc4DxVZ-tvlK66b?(VsVq^E3h!vYTP(?spS!SK2-=1)NP928JkNO&yD9Gye`nx8OB9>ldu?9LWD_*F;fKdR!|&4PT7Pb zhIEFAUgC>TJT9Z{ID^C(hlxo>=}SEw^}v@#B00X_z_+r8M#f06Dmtgb(b4%k3`u{I zE62g~pdT0v)zk0jse~`L%{RxFgI3SU_?KK{HExb55J*lM0eu>~-ih;y<#u69bq+Fo zbDRtOZz#AS5kv~zhgQHB7->Olig}!7^AfAf$DnO39KgSL4$UpeBfo_(-dy)qjY%Gd zZJH$#O!WL zPaN`r!oHeh249nLjVv(85MZN7egj`I#|^}~G+thBaNk>eY+aAbfk3s{f!5FLr-={c~YuX+=SFI;Qb9Bq}zyw<{NeZ#lQS5mo7%m6Nhj z6SD))KR@V=<^F%?eUafJ6jlWz#%hN-WYHv#m_k`+0TX&(08=s~*-?rTRF-uiAE@pr zs!WPPLW8Z{z(M`yUAWK;ljx(zeS%EG%>EHFsl|58aSNh2cWpVafPIH31g*zbuPKyL zM2bQ%DDwn29ch^(a5QhNK#Xd1U{@E)K~XWCPC+Dy818v?mfS)XT$8CM7G%2zwvjWf z9;VL5rrUS5kk|>tEmLcPJ78|Ll{j*9cA@>neYJ7e~!4x+CyA zMF$1E-H_~`>pPRQHdf5dZ>J|~a!u1WDB8Ncdrq6hF!IC?*Jb)2)&ldqjAj}v(EkhK zolnhXcf0kewY8JBHkFM|ss)B@AeA{;{)^|6bQCuo`tFxlIiJXP=s|ELWzIM;dSrhZ;tKUQ3UVXs(>sgxMx~pqH_d`BTyhR4`_|o+UJrEOCh2sZi6B(; U%Y+k&2~Q;6tgDmf-(IseB^4AIo&W#< diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern.pm.i deleted file mode 100644 index ab7c2fa55517ccb8007bf60053de836804d40a02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2356 zcmV-43Cs2X0RRC20000000{H|0387U0000000061|NsC0|NsBTi~}L=qzCQjLlHrD zZzS(}ev|?L00000000000001ZoUK`VPus{A|KFeDh|Rr;d8C21bOi*#Qo2RkLPgTm zmAb3QvB&X%V`n|%&?w4xzvs;OF?JltZWk%U_MAD7-+6j6bKFN~!r((3$&-`e@WaW; zZ!C#UEvp|e$2)}E%g@)ARa=Gwpf4UxKsw`)iGuw7_2BCM=F9Nr?$)xZG~gr*0v3AU z;B^FX;<1Ez;KpIdT*+g6uxh=PpNdx^T~Y1T}JzI218NjCq2jjTuZG zuMjL3v%+d603G64bmyXogd)P{=&Ekv*qhtI@bdQR8h*dLzq$P7)Ac|@iQ=V0@(6LQ zDyj!gRe$CCgoUW}oP`Sl*C9xd^a&kEVn{B$!3!?g6nhD0 z8n~Eg4p#zm!E+}}aXVpM}5d}JiyDc~6C z3BzI-QIPBS$P^=7Ni)5Vgqlt$1gc1SUZNuT7e$s9SO$3&Pc4mws<-3`uaZEkN&b4q zpnt?(C)G>*k+Wa*SQR{L%&e^Y!rK-FvL!eK*C;Db@(g zV(!XQb&X|9z+X?Di<`lvtsfafz*mV8y!LcRCSZr7J=i93cYV>$2a6+U$%FF*uPo~x z|LdTC3gWO*`*8E= zy1g<;u;1@Pi{l5;q|1;+_#d+$|4Y(Yb$`ub@b$~}{mBW*#t|lqQN5TG`hhkrX3G zo~=kUK8lk>x@Bf~lcL9Vxz-{7R5dM7si^z9s;(A9Tl3k=E`cy130wp3Sm{*GKk4`{LE{7HAtwO2sqXTrE3F4_#(x83yOn29KU`0 z`dDL*zJk|B?~dO!sU(d7x#iO+tUNrglCFxo6&6Xc!IejwT&a+G;vV7>`@T-434TqT z@1g!m@av(bUo{$V`^#ZK>}ymN{~y)eotaT~pghwjYnfhQM1tzPN>(ajzva8H6u%}8 zu!kkb{&Ot?)eBYUVrg<*y%c_}5xnXvoEqFrNRwYjIwVFI66%?~$#qrWZALwO6(|?#vRL(>mq^ z(=_W;MwuMvh8dNa zeBfNqB2_1_Rd+<3NLaQUOeM_h@e0FYA>cntGY?*@9|gl?JBHMvYfKem)eoWD2OQ!@ zUldS-f!Hx(s>Wp5N-#8P*;uPZCG;lO!2sFTUozD7XiO&}e%!(NZz2N?AiRQORgdbW zyX0O2`kzl3__k)(3uQz6lmTQG+Osn_R6}B?^;5O^V%d3T>-EOs)wH2_ly?$*cG%Ng z>@AcmRIE)W>yi!|O8qu7#Jbcg5<0@_+Ucxyf0C0aufk?){p*ds36~cw*wBtQnvkKq zrY8mnR+^nZdc7WfcHsL)TX(CIO1bh(N%+wU@OKhEZ;ogZg=|A`^Rc9kmf<7J}6cvBFGXP2)UFY zgDJWiB=>l@Fh>MKY|}A`dfzh!h36I9aITVVBCq;E&ky-kf>yIXKZm2E^!z z%b;n_T`<|LA5UI>9e%vKx2(@jf++wWWATVXu)Z7Vy9>d?Zk$Z?sr#ohV|1X)b2VAI a@obTuxJI58a+gK)+eJ6elm7$V1vkT=%9cL> diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_class_array.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_class_array.pm.i deleted file mode 100644 index f8d3ac14b0743909d6b466623b910b9a57155035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1060 zcmV+<1l#)n0RRC20000000ZOz01Ny80000000061|NsC0|NsBerDdQNQ@kq=ltCKA zaTsi5Kty~100000000000001ZoV8YMkJ>m8{+?ekqMS&&ytJ!+s9-_MUD;k=wtFg| zR@$vl790|7aB{Y@6jA>BjqN0MfZeugFCUO!#?LeJ%y@9>&+q&tfs2HSZg(=d=yu-` zM!Vg=VxRLNWB#V+IQ@|Li|6oRcsX*MM@*pw)6Y7z~G#66|s``TOeC z80Yg$I8Me1aKWOv=&A9&&p7HUY+NG zj)l(z?xIm^AV?g$9;WSO8C`wh3q4U5lEIa0O?c^960l_bDO!jS*2G?$VhKVVp>p&^_mz_*;8OzCuCfr%2_=uDT$@yt5|2H9xYrm?bjf7I7k{vkx zHQiJmenKsE7h8jEBPMhy!p6=dGcR}!Zp~saj6>yhrPCNRAV+xfgxZ{s{+e8Px{6pS5671qc_o(HH;zmE4QOpHMNtZ zZS9pk<1!#^Sx$RDmc9LCJd#MmyWg6VOw173mHpLmKCws;yGLV(_8~w>yF=$^ut`_3 zQid%(NBT#OIUWwPl}}r;h!h|rDI=Uv;fpAtkOYRzrch9i{|gjh$?{4QuKK^0M9y5V zsv_<-#*tL^Q?jn+}fE{UxOQ3 z^D1>Coy#}f<0Y#7>{W}X1n(T8AF;B__6L2a*8X>#cmV&1X?ZOyv;CHG>`Lu5+Go&i zL;Z<4W_Osq*poFrP8Q^A|EBf_zo|)L3}@z<2BKO!n%UP@HD#;G98lu{oAi+Q-j6H9 zaGwu4g$uf)X(r2^-2;(y(Abh~cPtb8`sQ~)Y*Lb607gWH&t4_2c?&m`spC91kLf?B zukrEwA)y5BXtJi|#&C)cHle-U+bT_Bll$P zh-o0IdcP|G00000000000001ZoVAlpZ<|06hVT0;Mv*1kQf(I$~M?caeRlv&8 z+Q48|hF!Y5)Iv`FduA7G)B2EJ$^mxYnRj@0U@D$$_!{9xNgD)ld=mt>sAUjbsaF?Nw7PtV~#yt`)XeFsdS)4+?+svF7%Q$Jh&Tp(mhLm0+~;&<2a*N3Z! z_DO9Ss||v&S|oPn*T1E@Rutw$rSf$fV9o{?uD}U?)DcltMsy%? z%XSRtDjOIL5_f_zc^9kMQ8id(PTakc%c*T1DH^kb>E)%$ z`)?do+mWls*pn6(`%FZ{Arl4mi70qvB<-~Qw(`l?U8kCk> zp(Lp6NZ#l5rT&eU!h=c~OS;b@4%&^zy%e%hbQr}~56gH6we;UR#Y{*{U9|gGP7h88 z^gOnyu*1=4Ynqp#o0^je8@877<7|Fjexcd9R}x_()m9z?;gaU+k+JVea+`Arx44BL ypZ41oZ5KuqQ>EAQDMW}A?9GT<&i$|^s%o@Y=N7n3Ss@aXM#%Ma-_JLlB1Z`fNf2%T diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_ordered_list.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_ordered_list.pm.i deleted file mode 100644 index 1ee7c8afc28ebdf6a318dae4ccfba5354e17df67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 879 zcmV-#1Caax0RRC20000000S=o00&V30000000061|NsC0|NsA;k`hs9*#s#CRbNDp7eox4cVqpNm0%zI)(DkFCk0pa#DwxgYd%WxS^FMFi zrD$ihA*9v}v{5|6ly>};Dh>ZV$J3ALEb*>R?uFr{e&t2@+D{O>48|7V72`B8LR5n6 zK(J@BBY?ln7UHw4q+0i3Dl5aK&xe{ER@_msW@s^C)HY=$%ZyZLE9*}So*SE}78SNp+!Ofg z^<64k*fw)zAu;UBgHMEAz-U%Ld=A4Qgp>*RZJc8GCNSKyELm!T-CaOsVCHj9Yhu=g7E|bWaJ>dC!j|b-Fxf^8sK>t{xpVPJ$Tb;1FOMc zvUBU))}jWv`J@*|amV7z+ALAm*eXcKKZ+aH?E>rp3OO%Xw+F(SAGbl9wX4S|rkxh4 z6gFM_LRnkjM=rR?Wvnw=Qgx{2nU;l1I z>uK6luR6sOwcKvI(k~DAtrf6Z(<$4uw3{O>JgisZ){Zq6zo<7<3~X;YK@_VL(|9_l zy(mED2eG;mt?Etn@AcLHkVtCtnU)8UtRqe=>CdyP=*6{@7Z?_$^LICkd4y-tT`?<` zbAgvI&K@1Q>F$*7&FQM2F&a78oQiiL_PW@WmX^W*I znK5~S!u68?00000000000001ZoP}0xZ`w!@{_bC~RksS>i+i5zW8O0p_USPcjkF!c4qd$J7=|ZHW*z;gpEea<@IRv0mo!C zS}=#(U zOUc4slQPjp=xEHq9Z+41;UF-1E%XXt+Ts4tdj5h5^bw1)Ku2tzge{D=NY(_V4jN=E zFc;WadB~g=K$&uuh#NQ?Ubv>+wT>;ZYN^WdXN?04Gk3-+w|5EkS}AZ0vwh#qh+m<> z;q72BsA5PoTR%Bug$tk#dZUAsVS;`R4(~J*z)WR+F@ckp&X=8W3)6P%Q(owA|Bp4Z zC_Ke@Yw9ieQ-$p0qYUFZpMS6y^JQD7*n40_=CB$$r{_HqL(oC5E7&|kNDVHAeNT2E z8fJqwpw-3LlpkJgG|kV{fzxlHVn2s9zA!#a7Kpn*hP*<$TdJ2sG$-R0y~!gLIEhK+ zh>5x9C^f7Sq!we{MNYBwkna@-HKfu*Ez~HV>r@xL<=x5{0!%gx#_>YqijdX&A0^C& ztIaP_+c3VwK4e%D0+0a*xjQ-u&zSANV}{7!i!NB-)eQFuR9O$IpiGJ|YhD90FgOdvtr1Ep1p% wsUP&Bcw_a@0%I_izU=s`CB8>j(e63+Hy%R{SsQ`B!i4%{)610Y7uX2~#w`8=KL7v# diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_subtable.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_kern/_subtable.pm.i deleted file mode 100644 index a171a022d10bb4b1e89f58891a790803074ec304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1213 zcmV;u1VZ}&0RRC20000000eyi01d+c0000000061|NsC0|NsAtkKyqe60oTgf!t4` zcVjPk^`=Vz00000000000001ZoUK=FbDKsG{?4!1DoTLHQf${BI#R?~apX3QV|yaG z{Sap~XE+2kI_Po4_Bj0a?j3M|-m1>T=&J&_Rio-8Pw$4m?cv)TDz@R4#h z7)-M}LGB_tG>lO|iFX8-<4+UA*b0OmNCD{QG)pLVBa)`z#~jAvnWp+Qnf-qCeu~d- zCJZA>5iNM=ilJIJY}|-2O4p>wmDL*`t_FkiP#u-if3lEoaOaA9lvD2_OwqPzjH}QI3Ux%ZRdt2&zNvZy#y9 zXsZ-SN$8^?X#hqeIJBWKuLvt3a+(uUK{N;Zz zuGWkuuHt(dCnAhl8QvsI11&l*F@Yjf{t^+ghR2CdO^p1boL)s7%< z1jeZ1T!BoP2~z@9PKN7%qTmZiv0kN7eWYgBF|zcWI1^Ua4{XEui-&@yAOZ@-)Dtlf z@NpVd!%emy;+wr!wx}O8JHOdOiV91X3wb6#=sAK$k!9-{QI=QH?X{Ejz7BueZ7qI1 zDoa9UOS9+_$~WRqR`JcE*{pKBWT6kR{w-{)5MPa4ri)*<~u@!=BNmvgn#8d6TX~JnrnNT$V zv0t}Nvtg1rUF(>Q%_4!#K7i}-=gH;F%v(!|s_IQnCy)9eqh6uj8qiYEbL4SXhB{qE zmG^TEQXia(41WYEguZ=MVD=vXZJ*?mRVPZ`9MjqRtDBh#8B3^{G=v0&^y{0y0=9t*yy%{Ve2?$ z|eD_zZs!9Z@jjpFYCD$snrA?%iRDt&8 zbgCR;z$zHdHpxX1|9)!-lybT}5aXTMS!OT=4L@ki;4v3^G6{mm$z&P$^C=-W38UL9 z@SJCtkU<$PVaWxf5`siBmE`FbG~J}EqdmC({d(~dELI*NbF3@S34^p@>5diU5*Q5= zh|@!njIkeAz#DK;uncxIEg4V^`-CHmk{W0!$e5NqRIp)Tp0%A#19swI7sWK_9Ik*z zKw-$Fk`bEj=|Q#ZZv2Jk2ab2|!ke>RICo3e$5Osy60UKb%CkTqT#f7`@rZB=fd1{?|CFFU~KT(LB=vGweI`nee;W~;7U z-X1Nq>T$7jt*QqRWfot+`Ic%kf!RL6{nrm6=tUu?^!tQcbr3u}Qh+{%lq5Yh
    W*ze#6A&fieh^3-=5PTg=f8x}8t@s%i?epU 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort.pm.i deleted file mode 100644 index 2d39c9580612b745ce59cf796022acff86eb25d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 780 zcmV+n1M~a<0RRC20000000PVa00!*<0000000061|NsC0|NsA|FQe03PH(gIvj6l# zK_VuSD1J2n00000000000001ZoQ+lAZ`v>re$QWVnwTI`LF%5Sup-z>yKaRd2-?Fo zAvZWAYOpigX@x5O_nqzhaN43R50>rk?tJ&%XD27o1KCly;!FiW7+wXzj0-jNyo-dA z?K#XRv#IC3fT0i9*&$D0Mitp}ktbZH5)`@5D5MMs#OP4Rm`%g4cb6+%M+NQ{l7dts zjqn&fe?u}wsFIh(Js9I>5AfR`px2Q!i+wz1ycsr|TcXaO6DK&Z zVs8?XzQxU8y!xZndNExFfer~=U}#kcWXeV z^<%W+ipUJE9BQpp=|I6UDy1V0&0H;vR`Xs}K5WF33)Fc}i(%nN;SKf3h-5_66#IU8 zQmu#@aiq}MGz3=7Xwz%Yw*)WrTq37Qu_vsr3o<+lnhPo^Q$%4hz~iO|F0m%m|4~~O zXfEDKA}bzaN>u9-Rw~pB4K{@0!bWYpb1qMNYq0j#3)kCu0J^L2@@^e=t7Nw{P8r>5 z)O`sI12Hzywhi9Lzu24YJbBMgNadeRZrbRy`Mmj)d|qGUFJR6Yg$Kr;SPe|p_;zL8rg13% diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_chain.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_chain.pm.i deleted file mode 100644 index 2ec826080ffddc00873078bc572693efb825f548..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1528 zcmV70RRC20000000p=J025gN0000000061|NsC0|Ns9ckC5#VNjq@C+H1YK z$Xu66BWdFR00000000000001ZoTXT8Z`(Ey{;pqf^Xy7O?Z7Dptgsg^S(|KK-K3}; z>_b}^tW4QjWJ(a}rh)7Kz9T70)Qg>L6A)M=kN1AhosyE^j;ttLB}|M)^ZC_i^e)Np z_0^h0Z0tB^Yf6@5?_6yegiis#<>2<@k?>Haum4jGQ2vj&C zCKA}tO_Dv>UXV9zH{{%rMcoBUB8$!A-%uM`8@$(t(-*$Y ziiTtxi>sKdct2+~rEDeExMEk7h;2qM8RiF-=gdS`#Ra3jxMeA(s@IuLXR{7c)N~6g z9PrM^&($D!r*Lx85aok*#8CqZBXS}0hm`gUkuxep#8$XLnbg>rxQuwQtQ#?#O{b+1 zMn<~jYdEi&(pSk+&>VYQfr`0ibvA*D!cSwtwKZ;ygE8`HOtd2k9=2be#vu1y!NKAn90MSP8eYqh4G-nE3KJm_#q@ITV|u50bAmL+I@*5qVl3%9dubNY!M# zrACGoJcHr4;c)nKUKn)~koF*q4kiJrEvTos9@P(bv=x>*g$xUkT2FT_yubKxc|CU( zfIsPio7}el|_Q;?x1r4djo+GSpki3 zH-j)sHhH@MY~5cTAV|^&ta`h7Aj3y{#}gZd4XGvaa~t@*?xM}rNVceX)NVp)hMmuo z74*K+G8WAk_hHxv9*~%1Ey!COluG$y_z}{W1azImOX)Rql}@(O_5xe#EF0~nuBvGa zN>v5trLj3O7aKXs7Hb2Vd%v0DmPWh{=p+Y|D~-!VD0LE6V~N9`73cBMRQ~BmJzDP2 zsCV6|&I!JMocR;#q*@zVn68fZ@||NrthXD&1`@(lkz_Q@D5p#i5hVG1wWCI3oQP{w)+B3%HlvuGOj9WT zNNbd1o>t{$)IzU={env`^}*_yQUMr2?S60g@|%`y zAJm0bLm*ccAT{U6gLpswFQtyUe-b$%^p*%Qx~lOVMqmv}xjB8XN1uEX5ySX*;!IJOnB?D@x1qB9*ItG1On3T>P87j_FVnVv&vHPSYgekF0^I~!X} z4W-WIJ(*efc&$pg__d#9gstcXbHr_rhx-c0efmvoNqmT68m*KA4xDcp=E{Mq*9jX0 zj|zChIL%ZFHwjEj&ome)qd!U)eU=lb=iV~Y`aBo2S)SmJ>$|qQ{%9q$=mn< diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_contextual.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_contextual.pm.i deleted file mode 100644 index d3668802f73194b806ea2a74ea0636e7664998bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1342 zcmV-E1;P3N0RRC20000000jO301of~0000000061|NsC0|NsA+1R^`>gIbuU>r{!s zf|@4E+m(3$00000000000001ZoTXP=bJ|7}e%G%!RdA6Uz&O*+cu=9H4Q|uKaVOxu z*dC1nE6`X-L|SUQ4*$L9>_u8hCUII#g0+`(|IW9oO)$R=mJH6)gbxO@+1X%lo@V&^ zD^9R`z71l}vW6=bERNy*_=`Sv3ZKE@2fG=uSYRwz54%znRkJ;m{S z%Pni0Gst-s&ABJu{|>SoKHWK|Z>D2cP8o(Tc@*c3SyaD$azXkzRj$b8Hy4A!Swtg? zY`~DLRh88R(GLsbfrQ;zj~3vwegLO6kApn#Kx+|YY|f)J!S^(aSi%D}LZLGj@NLG< z;$WG(XzbMYN)0)SLz
  • rcB-+%~6&Bh%#5l7<^?Q_ghnX~~+)Z7o@wZwT)&NAy=_ z1!Kxss8Zy@=g(?h#*Qh)Eh73(v9MDJc?B)r9cB1tSs(B>2fkt;u@ogdg*98J*@MOp z)kSQ6tfmzehpR@y7Xf$WP|vk;Ob45h`Y8_(xI+@`jyQ{B$MtH}W>jw>K`)p}%%>YcO6vJfmg2145`f-yLIX|I|V2abCbzie>#~d(?W<83*S3%+&6s^dZy7o zOs7%k)Gm&*EO=0EKIoNou-Qb(QVfOX+hl`W;MfU0Ho>{b5v3=N))A+AUi~Kv9a-k? z=&>EMWXV_U9g@Y#jmim<0}JLWa8Ao)md!x+0|9e#pyiVmHE!>`Vw<5vt-7_2YWYGQ zex{!;Ca&Tm9AS}QfSFjZuvELV%3oOv9f^VhhB5?=3$MCGVnptc@3jre1G(j@D8eCD zpv02m9|@!;Y8t7Q#d6&nuM&P~x!z`EmCQJ<*-v`5-cx2fReK5-swi^$F5JV9u1DKm zz$OmnY?a0fhU`u!f`MEURwk-UP*no0_HQYUPDqS7H4Li~iCWZ4sLFx@(35Q}qF3uh z+ds(~!qL4}W!X)m8WdGRI@YCCja*|DSqvfBAR*myq`=dQ*<^^ zJQ&Re8%d-(-^3Azqs~#8106w$Y@){}v>-a+k*I}z0^3HG=_8xq@MRIkPFwO6sT6Tm znP^`&G+UTxDjB4jaDz!s3qcdVq9Tos{r`uFG=Z?g`ld#*;(bXz=)m61JdKeda59GG1~D+N|o*k=oaZ{S6FKV7?E%9<*L4 z0TcM8@({K2YYAOASPZD-zU!GSBIU~?t2?@C`Nmmd^qAOCKW0gVXo)J1$T@B2*EEqTtT5D8-r~B zHGbFLUDeiaifAyN9(ZXU8|x#AEc3oDN1EXmQYo~D3*0avU;u7x>% Af&c&j diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_insertion.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_insertion.pm.i deleted file mode 100644 index 05e84e1d47ff9c18c3cde1829b0fa209900260af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1481 zcmV;)1vdHs0RRC20000000oHv01+hs0000000061|NsC0|NsB=a9h*E9Sez^(nsTi~viMaF+JO_%AK?C1~}t3SdiJ?hjOzyCoGfELBc5Z?|N{WGk1ftk;CM=p+7DdIj&4kRWrB z1JBRdy1YBO6px78yT!&fi~bQb($*lskzsto-we_v0huQuO=Gwx_i^%+=LV09IK0u_ zion6L=J2_nI&zw?HS#1Jr#_}+pNq8yDTyN6$*v?$q0`7@?>Rju2+s;3!3XGY^tuQ> zCgGGDI~AK#q1Q$r7mg}sHA7J<=OIf^eYPw#G|KhNnOHl-pDn>2mYT|Z;vxYL7`J%Z z8f+{vv$j3;$WWsG60a%0nr&w?KY;h>{YX3q1_OBGg0}8;0>{x{8otQMQdc%twH4-i z&~8J=spNhbpc2KJ>&EmJ2H;iCiB#heV1(S+weTDkwzLKu!YwKutNQr(!*qN+QEb-` zd4NQwxKOj?pa@jeXd0(5CqYQbTn!Qr-iCv1cin)0t2JA~P>rh#*K4{$=Cw_FU~+=N zti7$P6&CMO#r^+%JyX!OH;J2yv_^r5&_%jbIjlHBM9I~hl{o+fpe@NqSeoq@WL0BC?!8fx_)mMaN(ZY- zbNB0H+sTP=9R5w}TqqqUBx}?u3{ZGfixBsEJ=0!DLHTFvjObz&=F-ld>~wUOiYqFw z1i#+Xf5$5h0!9SMs;3X(EpkiA;Kg~)%sfLcg&5oU4ya+!lDzgnD7z{hNea?6xw)yO z-*Vdz`*4KTvY8+G2^yVc`1WPbk=>x=F&*=$y4l-=o{ywWePF97OyQOLO3|A=I(_(u zKSx1O+j>TK=H_hFTXN13(AVDWEmH8ickqVOb+L#&9az@40CogmiPfoNWm%$C`i|T0 zB=&oM1shCIAYTv^egY4=BI-(v1fOnm=c!S6Vc;tk^2Y|lSs)d;-l_7HR@5a+Rcp7* z@C*~{7908Ob@g1eMmi1;zgkfV!FH31r5X<>*b4H_33>Q;K4##%=sgXAq|KIMhsJm6n(z4+A%vSjm#cl9t6PQqESVFH@pnX>g$30bt6uRYIm_KF?s6MI`1`-<10;vBolnsc|w@W(Mr(vlEG zJ@XetR&5dPDb_9i>Vnxfd7&~AxHj>RC@F68AER??D>x1JZl%LY%}(JEbV;ZDx5Lj@ zzm5&#V~pf`N8<-tY>ciZrC&h0fjq$ZyL>vu>5zp{J5CmZHjD|uP32zz jd^iyQnV7|^rzBh~Q}F5Bh{746EToHe&LaN;8#BO~V29XG diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_ligature.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_mort/_ligature.pm.i deleted file mode 100644 index c36b90225dd622651d0a223d1444c46a46c97e6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2071 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

    u?n#N_yO{m4@CaBP>#BCCgc3Rr8#i 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_s__2.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_s__2.pm.i deleted file mode 100644 index 680915c8446187b4d1828d5da7abcf4116f180ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2880 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_t_tags.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_o_t_tags.pm.i deleted file mode 100644 index 35d40fd4c5a036b086cc03024e7526af7f5d0301..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6368 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 X^4VO-x9BdnnHK?QOWglIWosjD`bdg4 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_old_mort.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_old_mort.pm.i deleted file mode 100644 index 85694934858c221bdb1640fc8cc053490e455a3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4892 zcmV+%6XWav0RRC2000000215)0A)o00000000061|NsC0|Ns9G;MVCyY2_{75>~b1 zF~BbWIx0B;00000000000001Zob6rzQ`^Q8|J{GZ)rCk7h8mJiGbXqg0u8SuWMY!{ z17SSEma$)q9LAHFB;M83 zCzF79WCU#_nO8@>!}lle&QH$X%4a8Ud*|J^hezaN_x(xt;Pj{mMU%w8A;0@kJPCtZ zjgjNGB$(e^`4MrCC%68vO$PHQ@`Gf0N4B?G4bgTm_9j7Gt4$|yLc$Tb(fDJfP2zil zF_wNAPvBzg#blDiB>WPP(Zrt)<2H~Bp?NZB%1gNbE1{c3T%AY`AP0(zPOJ4B$)));?@sPXp-?s%x|wi z+p@|0ii$Q@PO`$XEQyBnmbk4piF_}Lyx`iufl=;~ZBQIohJTyPy(#t+CzE8JfPQz$ zPMb_8*Hk3CwdZXTgu!NRRJF_Sp_;C!9NuLteIeqVtFe1+T zQ%AN6LHI%9v3A~UHU(XfBqZ1|8Z#TZQVZyOeC;%e^AY|awbv;z;PRNMm0L?P_Olj( z!-~S`6xsVS_MuKhup*y8F`38yP_-kbzTQ7DW!45;{mV^j_5g zF$(#-nR;=I27xv2kPKQzj2G89(PKG25P?>YUeJnQ9AiJecLI=G538Yw=y;ul9KxYp zpFYA;tl@rFat z8(d%9c+qEn*c5K+vPK!kqH7U${Mdc>^{Fh7fm%3&wQ#at?)~4w;N#1`u8- z=u_()N^28M(}~Qw8H7WyVJv0rB;zQYUyrGsP+4(HOWSkxobm}M_3<`;63RL!Vj`wm z_i32auWB~C7uYdQVnEdv|-9PDd8|;x1cs?YPX`Ff5 z?Viumf|Ij$`*<=1?@>b{WDm(Hwa<~ehKO!EWG&h3fPWg&83OZ3nSrR88y`I4onRM6 zPH5%(8iC)<9dXxUe>!SFH~anF^x@D;nq+M>hCdLp4r$0~uyXo`w%Y9UKD;}6-)m$a7ZhT#z31_zjq*F9-o{ZIg7NIvCq4F!8>tf3m!Sqx)oM{CP<_IA((-3 z-1_LW4#hx0&AJ$-3HOrc!%fU zr<=0-9t+>_fJJUGVjj8atvRM%@ANb~Cj8Cj@tEuzLu+D*&T!Gs!9e1OyS)z47_Ux- zCnk7F+gPNFFY|3s@$Q?~B_EK`>32EK7TCJbBE3%CQ>XRyFr<djSBRY#7~_SCiNXb9a2M}Zj`=|rL^nUm3lT* zCT-WuF^h;S3>86E;c|WM5n$;aAAYZ==^295sCY7lrbM$Xv>=GTeKf{CeblFlcWLZv z8D@k(X&V@vI5}rQ4U65BG-3U+7VKJYu+WFZ^ zisXcmB0FmAF82M;uE|SNCOPeP@95~)e(&hqCTTMu+0?;O7^L5u{1;sW9Rux445N$L zFCWUCDB(%txs11S?n46n*}aGm?R0X3OKtF!EAcJJzWZ&N1BJ(u++@Hu+Sk5i6Jq78N z_!bJyBc6>$Io`skyGQ;gs!it&@8>&~2;@34tQ&+0?srZCe<89dH!D!P{9;3P7DFher18Osm9S=Q{;=9o|YDrC#EiKBH;fy#N4!bVXJMEF%3%y=y=s(J#OZe_D zPtwiZTKriPK*loa`?VL3?T#v~^WZ#?VTDE-Xm`v|eV_Gw7|w%)B@C=R-K%@%Lpspu zkRLG}P@cE8b2EX5ERb8c3A&SB&nle!{Iu|E-NEyW7s7RuQYH1K-F%2D0GZ8HTvlY{j;xb{1RFL@= zYe1(=rV7rwVL+t0Qsq`6Az~&+Zo>3>SE;dETWDZ;I8QKQHfpthN0Y=?5%VO(LtnVa z_9yI&N)+C32p#e5t2;6XXLszRk_6O&poynb>|6!a=^qsym)N;r2PQm7FIJ#(bm0;x z*TC$|$XO>;tg~nmBrc+2?-Xd#t(UtKe-2#u>qaf)xpD!lFTd_Xr! z1o`Rn)X)|tsp+ZEwJ>W93`GSZnNp+6 zbi5J-imQh&==8G72gaYw1|-8g)@MP0g4p^1%|M zu`1Akx+kx0$*Vi^8l+Qcd8KUi>!ZM36*0b?-61A?Ik%)Tvei>X@=9EZ{I23sP(dP= z<(1imWL20+1;EBw%qr$+48lZ8#Bw+{!N6EtoJXy&8WcZQU%)oyW@tDGPerB?IqnmmHqv3 z@XAX(wv>lnTGrb8X>GoADu_>XJ9h2+RihLS8!}9}5T;T~VB2mvyQ1nj0~(GBPfW>R zyws^E{FQ7IA{)l>g;X2W&oQJ2GjeHs-91iAhdMW@<&>YDps$SRC>H9H(Jk3lwi_!f z3ZK)wX<7ZFOf*zj3 z{j&zR$v>VwBzZ+Qcd>Jc+BLg}c_pV6t5rFD@Vl&#Hi~p=Pc8IAF}Ws^LSAKazwE4( zum+_PSVm@g=9x$)(xfemoT_$eN@>HUTmBTrcE5uPWFzfl1jPT1FH{PBOyV_>7mzS#3_YR-bn`&qN~l=Xd10tT zn-|6NK*_R|^Dns`GCfj~Jzhk8q(bC2n$TE9u04X1%;dRlnMTkp4x zJB#SgaIvkPAga826>AtdbmhcN^;NTM^mkr1ue@;9J#G0pi8|Gg?+WIXogsC3t}DaHR{+>0OnI84ffU0mN2Q;a^ly(x zO7{)3@#_ z>|s~brx>XAs`tC@`=ht#&O+e4DNGGFX6soP=eNc}*&1)u)|@6P+3B6XI{R?$2rONu z^`o)+zBwJ~$gPWyvaF9j1y+ze_igeV0KODDSK(>%~rPn3~f%VplTgJOu zpqQK1d*)?vI|iS&UIF0-RzD@;J0a`CrueiATthmcy!OnwZxZz-X8sUdxw9U($$ISI z=<+kc2Z84WbeV;6Qg6K*-!1H_1coE@F`j6 zA4O_{LfC&<%3N(w)m@Jpg<2B>>m%QN7RMW@b|m^Q9%+z#_9gKAj_R-Y$BpV_i@2_v z5y%r`-tf1GekS#^pbq9*KO2qe1ur@OC!7Q>%)WxbQe9xmU05R}2AwvSx4(kDV*D-0 zH3R`n`}HY-0?52lk20Y7zVXGUJmL*=<5{~|>6`*JJ^?fIMIPB?zCZU}V-^d+V(U3C zhQJ_J<+hsIN?pZoIYdhK)pMt%BLVKTJ!sZu5yoE9q9K^ZjpUvV@14spR-k` z2a`{1qY?s0n{Kxiob+a21(L^7i*{gCM~juqc6jI}Y0;hpbtqeVr2bu<8GQ!jp`UK3 zMB-&0i5Hbgbn-~-l#$Sc56&EdIC%8BvQbQFrr)AMe?(`?g{3>_ZPdsER&w^MODD75 z?y*lIm3bet{@3VeAck7xD=@ZR~@J#`irM!C)Ztn5Q7 z95wmoLH?m0WVPt2qL1nUke@S8sBieY_=6SBkrY5|)vb}@dSHy7k}`8taKP*lfjq<1 z`dg2w&q)`00zWZ;9MH{{c*rp@Tt+^ntH?Smkranc0mbTv7Bf(ghNJKopI2TJEsaiP zR9NA~a#Mqc@*4)!xyPwrPl@H8$f@$Oex;!=2~K4Oo}yCKE%#b%j9Fruq?Z@ej0%q$ z)s}gio4+!hij9LgMM#;D0BgzMAP~VPafBj;h%BShPCkhj$V)){7{Bm+53`=U#P`## zU;=*j?_#oELcq%Qr-W;ZY<7g=8mZIjQd)g=w6b=qys-W)Y59jH zE#H-I zjg*V>^K8o_?cWm)v**xZR}}S>7^U=4Dp<)r&BBod;j~QL(m3&MeGlG1@?@67Pq~}# z!s27))p=7qkt$+*7(DW|?||b@IkrO? zz|XZ>sH1(m-?8sNJLyOD^J<9nDW{wsBgtv1e*r$P1NjYjO9ejaHJ&fhL0_PVF7eH9 z*ZB|#J-ZI71kbr`5vSp3pG}YOkOc^SJN@TL4nF+Sqo1hv37ZL`p!?zc_1XJc?O$Qw zC1WojzxrRu=}U3jhui&lGTjQJ>&_PG`92gXABxAz4t*m9-&v0)*W-kE!LT-+4EzB9 OO^Gdm{{J6|i?3Wm*K-E| diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_c_l_t.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_c_l_t.pm.i deleted file mode 100644 index 8d8f7e3499c303e3fae545b837638f460ca9a51c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1082 zcmV-A1jYLR0RRC20000000a5}00?*h0000000061|NsC0|Ns9|n6K+!%4G5Q zPhd5@oHKT$hCcYejm~g$ND)HPgXIq~R*qlh>)Flndb7M*F}8^?_wY6lsd#JPk!ztc z1F66O4V+*1$plP_fe1waLWW8w+zKTJu&g&MLX98{>`+KGzT9>Q!X1bcq;h*Wva{BpVzGm!7(!oNllER%5`e4S=itFu=F`&;QYU7G>YlreG zOCC`B?X|E$`Q%!ob`Aw>cM`Ctb zW}ARUn`uH-Ykn|Hg^)=jc9Oafl<)w;xajo&k&f4U7D*StJJLwajPY{tz-T7Q`Q7SwKa@o3+6>KHIqHitrV8M zc&p?9oz}hwtw;I>^c7^}6mA4`T7r7<=ZK_m3az(wi@fOl7(R5paURQk8o|2cOD(=% zQnverr%T6LPiW0mL^mt z122R=omefS?Xid zW$aE1i%kd#FBqR;sh!^2)P?H5u}L606JDgC5m3v1gJuD_=H0fdXw#^iI$iN9wK6J0&DF})8o(;FE559Gy%aE8bN Axc~qF diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_s_names.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_p_s_names.pm.i deleted file mode 100644 index 6f687e28bb04a680e23f314d0ba241ab5aae650b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28095 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 AaR2}S diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_post.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_post.pm.i deleted file mode 100644 index 43aea9463240ee0f62f0f77b5f21bedd5f103a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3337 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 SP>cd0RETyQg83gOG5nJhkm_Op diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_sill.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_sill.pm.i deleted file mode 100644 index c30cc856f3089bb2b96e8fb63280db0dda9b650d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1129 zcmV-v1eW^%0RRC20000000b!j01E2>0000000061|NsC0|NsAEg=3PTITXZsWy(-f zE8=QbZ}-Un00000000000001ZoRwB>Pa`)F{=UCr#DTKg3tWQufRYB0(ojX>Qba;k zi6Z1=y;)y2-e7y-B9#B$8SndEQe7<}ytZfNnP;A{vtf%BTXMLKrRnu%v)f*8Dx#?G zID?QgzYCM$*OB8iw&4{1P;3(l!y#gFnUIS$+iZkff?@NB7xur8rZ*4c``P%7dSzuYrqdJV(BU_!lwwc?{OMc!&4yqHhnyw0ZucVPQaN-Q~?uLLmuIrvWsH5 zq~sTgahycg%JyhPr2CHIuZd8#9ZMlr^m;rU!T?_1-R7o;yE>U8bmluB4&YdC!96DU z9-3Ug^vgx8K^u+*{(U1mT2~w)OR(ob1exXO)kn*^Z0)?%K3kqX-j5!7J=%KlnSof< zJY-HwCt3AdJB*3Z2@zs{d6XNhi+l7oJ!(T45k1;~)=3a!6s*p%0JjTgXPJX+d;+nQ zcmn3}GSR@LQCmPjT>92JrJ~3@qJoiw0RP27pt&I|Nrq#1AtfR~BDGO&0}xRLzrZDY zh6~T@=kdGe*h`n_8$tuj^GjmtvwInNH3-B$H2c>)_Rh;LqFOCu=kq zz-4K>A_)6Bv1l|*(6#v_GU8evZqFb*z1k=tjZ3NAXWfOP+F*@tJj_VuwNT^=TpcR| z?jcgVHncu>Ti(9jvns~KGhVNMu>Lq+?RI5`E8wrGw^C-6{8E9lv|}xW^|r2B3GPquV1A9n3PS{ZAfZa*?k~@srs9w_)}uo=%dXNMb)ogn^135h4Zr7vcFXpOX6audoT2=hMtNtIU6xz{fhvC<<>#Y}lQq^h4K zy<{7Zmupb|w{Q+v1cRZji|VU-TfNRlAq diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_table.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_table.pm.i deleted file mode 100644 index 3ca1604cb1d992d886b94f5fdc737a28afe90497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3265 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttc.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttc.pm.i deleted file mode 100644 index 366ba1a7e531d1dc03a5dda412b59cfdb25a0035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1659 zcmV->288(l0RRC20000000uh%01l`C0000000061|NsC0|Ns9Z<>9}s{b@%f2M`8V zdd(jhLz&$G00000000000001ZoRwE?ZyGre{_bDl%OM5S1f^9!l_V-n$rY(36`_?* zr&DEiy{s>by|KNaDCNK3GhQz&q`mf#0)CtE%ri5OC#6X4#6t3Gqy4K_v)MJid@^9{ zB9|h4&L_hUBgXc3`6-{-O8Rvv`IRXOnRsP1PYU7OR`BiU_G&u*I2+$g7#jwG83`mi z0p+-8&rP;Fmf=Rn6&5uns*p5Z$%UBJ7GSTd^Wp+dT&iyCD2SuiP4EHJ=r99xDi((?yY zT?*?}QWe71X22Iu$Sp-GNwzewyit-V>vo>6xtafiQN+zknCs}M@{JYr2S}+&`;T%vD(I-eJZJ{}c=%;4$)WCE?3LCb@>xY)t5dtF(HN3UJ z92d7(fp=T9M#ESxt`{7XBFVuO^HVBnVjqgbwzReu#~6GV&EDO-1@IS1~JLI zVCF*VTAYqqsvb~3SrafpO#7W+_4yPcA@keOQ2N0X521ML-GD_*#WsS0Sop$FvMo0@du9HPZi;tVuVwMwhG_7<&gwh3n zHCXh*MtuQ&a2oOr#;2EBu9~BG4&a@ytcIdgW`nKJTb=O;DXY}r=i)47eYhEKXJEpBo!Xuc%R@K zwTf?DE%B}JSD2&;ZE%|Ij1tdZM8~^_vUFpmQT}(`qv6ZRiz6&Uq*2t4aFZ~kg3Eh; zgx~CF@ZAeZH9tS+&Ar42-HxKt9Kc$B9!}8k*|R4}2S-{~O<)or1Q|5CRnUCGU-o)~ zD6(iFfTMlnPYQ7Ps!xx=r?s4zi@pv-p_b(ir8rXEL1 z>Rg&mFFY$d8cooAh{Q{)(8nc?h_KcjR6AraTD8ncA4nKCEFhi>Y5^e)A~1&K@--W=A^UhN_{5Jc5R z6Lxg1(F--Djgv|P=S~XM!N$$tP+x10w02u_a8^uau<%9js@KlmI-U2^|91pcT52;z z-Qk69p+wMOhpKy(R&;+m%vt=KG@IW1$=Fq4kcBRE+4N3AoStt-yj{6=Y#NdO;Nygp z#q~Wdj{d~L+-%#IH=q7M?=mr=^Tbv;Hlas<-g{h FjStgqD~|vG diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttopen.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_ttopen.pm.i deleted file mode 100644 index bb07642b8d0f2414c8c1a72cf190a2a5715bba74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9985 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 LYoh-TJ$_TI7s+p~ diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_useall.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_useall.pm.i deleted file mode 100644 index 727a333e4122cf6100b1575872afe98a8cd356ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmZQzWME_f14dg02A1~_HUr~-C@|%|%V+1w{@StCbyIEE7sqI$$IVbRV5(wH>lDZQ zCI^Am_kX(nwSMbRKicFQ=o7hjmY|!$&D4|c629CQU+j5#kLkS==K1OA_x2f7)p_UY z7p@7BI-a`xtB%zF!%uYB8(vcnz_M62-N(trIw}pNJ7yzR-13 zZXi=kw7AjnMV2=|86Vwp!`M3OL*=HT?FS0B^qkhR%CcF1gs-R0ccygIo6{l6Je3>x zeJ4m9DlI>_J@zu|((UIHo-MyNYtMXZ_v`6Q*=(zxEL~S%YQ65W-h`*S7l{b*&HgFS z@ASxVjzse>C>P)#|cKH`94Pty7e|yLq?yw)Jtb9}k=SylkFh Vk?=kC^Y)}KcHMQ1E&pbm0RYJcuWSGS diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_utils.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_utils.pm.i deleted file mode 100644 index 5bf96125a656f464d5d9aecee83c9bfbab2fae7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5841 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 K(fBvm_~)dAk$A8G diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_win32.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_win32.pm.i deleted file mode 100644 index 25b56282c94a31eb9c3721387e8076c19b606229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^<&0RRC20000000Gkg00S)m0000000061|NsC0|NsBSWul9l$G?Ps=tWV# zq1b9~?Xo}s00000000000001ZoMlpBZ<{a>{m!pAb!-NyEL-}`C~Q%btX11YYEi0b zR1u{|ikjfeHp@`TetXY`maRjw@SWe?y?b}NG#qP)+^R?fiz`nENAE3gwP3_gO_aXV9Vna7?FUx2|pX25|lpAamWR8nH8mnc;s%EVAo?5}bX*T#1Y z?uPm^KRS8q$*DEJ#gblY)IgbJ4Y?Fskewiq3kfNh5D+=&heAP_ZqbIhod2(E5G{6C z_MK9tjzw4O#SEfvsF&%cLgiU{W+nzeB{9t&h%9(YNDY)l!TW;+HNM5PGWW6?PDWFU z2_nKaKR(@tuc#7#YpBW%D)j<~(H~HQ#EWHxalOODcLxLE_c2x>%GvKg5J}t&)4Psv zS7&&83`g#CzC5r!jjxcb8Q5hw`X`x@aP)S8f=IM#nPI@wlO@_meK?pcYP{E(**@Q7 VwX85z*!ml%ah%Vg^9%}U?#@GH|3d%( diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_x_m_lparse.pm.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/lib/_font/_t_t_f/_x_m_lparse.pm.i deleted file mode 100644 index 2bbc5ae1d1898e907de88abb76132ab57b18732a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1978 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/_o_f_l.txt.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/_o_f_l.txt.i deleted file mode 100644 index 0b8fb4b42baba3549803c3a90bcb946952d8cc83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2058 zcmV+l2=(^>0RRC20000000+td01=J=0000000061|NsC0|NsAcjdjh%$7O@J^neW; zq(!adr%!?a00000000000001ZoTXP?kDE#oeMjOyl;&ZTk(kL%_TIfx-iVDe=-Sv9 zGs)%=LwnpCpxJKl#Q%Ozb%Q^X)qX@#f}8HDQ>UsZbxO(%4dcTzQZ75Lt(>~@q2BlKRBG*eASNnQ*4^xVnHP$o?0 zd%lw zVtxd@C=ftuYgxTvl-?lFd*VEFicBZ#zREkWq;yrj%2N1VDfZyAtp!fOOra_esWh^` z7qn$ttycdKMP~wQqi_2wbXO7s9y=P!bZE9+b^xWQf}~q>bn9R<_UMV6t5DO)H9_#GQZ2 zx1AGf-z$!@!@#!95aMwTmUtmCCq~)3rildw>cN5twk~G_PKs7js@2F&-M`G^T)rmhYu_J*gNf zSKB206-A7PWcJKK6buL~A=d zFTOSE6`k-R2CfEO#J&@fThjQQtLF>c+BJ>4YFuXtY#q~N8T!pJbR~R8nS!;GXazqS zQfS}0Hbn=AX;m3F$ zXI}%F#aY5eXRsR5DonF@@;nbyT0N($B|byLWD2`UoXk?Vi55|k;g&MPUU0@fV2E*3>Gz#Z1xn>|Yn^9)}0z@Uz%&VXH82|tP diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/tags.t.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/tags.t.i deleted file mode 100644 index 4181bf2bcbc73365e215b259c5698490f2540c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmZQzWME`~fV&I~j8#xJ<9{eno}sp#XXny4%J)S(GtR8r)Gg~U4XOrARm^GaJGidN zK*05T-BFz@jYsBMpD}i1HI=HI_-bF)RX3I#cV5LmyIob(^w00eTK;{W@!l-PSyS!= zt-rWqRwJixpYW+-DNY6Bj2|zZw}0pPt74{@yzenf&&TGr(|4Q11gDl4AN!+YqH(bN z>FGGPLuU7$q?oSu>w8#W`8PG9RpBOsZl!$>wGJ~KVJ(=gb%^gl_lgFl`-`4W zl6n3vX;0DdxR*tLCHEARuYc0{IU>AoRZRK*47bUpYb9l$`pT$A98}+Z!f7}27 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/testfont.ttf.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/testfont.ttf.i deleted file mode 100644 index 57ac10e6cd43dd302fab074dcfdad01a64287f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18700 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/ttfcopy.t.i b/src/librarian/font-optimizer/.hg/store/data/ext/_font-_t_t_f/t/ttfcopy.t.i deleted file mode 100644 index 5ce2b98a6cbc6f2072f6b81c997703262d2367f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmZQzWME`~fa?qlj8RZF<9{e9(GR`#*KLQBg5!;gSC%}^_~o5b1XTm3D(2+&`*t5P z5NLbJCp$i+f8Tw#F4C)>HM4wPxt(2_>z8#I zRA8)4>Ennj; zpC4Ov?%6^K_ft#OI8FGR>gh8-aHi5!Oa4WHFJ50uu`?@RjC#NCn`ODiEunS7C6OA% z0^Ql?`d{Vv`~PWO7cDrCPxx@{=LGram50BG%e?e>PrJx`+fhA)wpEg P_X)lnKUrHQ<}L&P(R6;+ diff --git a/src/librarian/font-optimizer/.hg/store/data/gen-tests.pl.i b/src/librarian/font-optimizer/.hg/store/data/gen-tests.pl.i deleted file mode 100644 index 815d80025ca64a7370d96970bb2740b3786ad00a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3373 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 diff --git a/src/librarian/font-optimizer/.hg/store/data/list-features.pl.i b/src/librarian/font-optimizer/.hg/store/data/list-features.pl.i deleted file mode 100644 index 1b72a5db27ee2b02c4062f2963ae1a59ecb7db9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcmV-90>=FS0RRC20000000H>`00W@_00000000vI|NsC0|NsAXa7e(~r+^Anz!&FY z^sG0Pj;=QV00000000000001ZoMlo?Z`wc*z3;D>P*>Oj;vn^82MU#dOH`@=y@V8* zcgW{i~zL21cfbZG7OND3}e z71pkd@1cta?ayv?u=58_-yn=A=4zm|IBnS&I=UR zxkMgwgw9M#GL4`11s5R!I5(X$^=C6p+Gq2eTs#vZFvWGW&k)>HVgWHGTwvUGombzIbxRYZWc%09s>&@eARatAdo-S6^6{V$ZGe>{G z|K)Dqk6$X!h21vpd0!p>G=`0k_>!lBD~#L20Uf2FK7@`A&~1sjo$#ta-FQkvcZSy< zK?e^!sU;|*JFR-X>zJZcugxs`mgnrQ*!f?d`CC*#$JuQ~r+=D1tDCe#m6&0q(46L9 HCIk$C5)BF1 diff --git a/src/librarian/font-optimizer/.hg/store/data/modify-names.pl.i b/src/librarian/font-optimizer/.hg/store/data/modify-names.pl.i deleted file mode 100644 index dfd59249b5c62a6dd5fa3aa5af85fd1962669db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1975 zcmV;o2T1q;0RRC20000000(yf02i+S00000000;N|NsC0|NsA6k7{>KvBAd|03iXk z5k{+RbYvm`00000000000001ZoXuEmZ`(!^{?1=9RTPjyNzroqp^#$3LE{|yr2!JB zC?Kf@O|GPEsU^)_S{79Gx8KYzDJ>~lX?u6L3PHkM&OGzF&kpnItFV+s_`pS&vm%Ay z`?n6jD<~xcwPLh}MH($ZW^nWN>}l5xRvgR6=tVe6>)O|RCGC>K$z%A&$anB+@wTxi7_>WPUY zD}u5}8?uLul*dd+WoB(MTIZZ-psvvnRR{*bbOqBJRq z);X>f=DihU5c5QDZ8p+Ir{xiMFriAkwkt7l`u1|ySWWx)^F7w8e-DeSfQ#X<|Ej6% ztRpTw#C6aLtXP`Et_lkq4&J=E{qTO`+^w(yRhFf=ojqX1lUmznPff$Pf-6%WKU7Svr=L=sEDT+ z&jTW9Z}HGzgT|4D!B7&@8DIQ4Z^afQ!!8#wg{i?7S(;`W%r(?87{`ng=YB@QU4 zw*46$o-XG{Z=y7XEH+`q*ix9XgZ!UMIc&IESN5iY&OF+kBdxZ3pK=|hH9H<%Oc8G+b~lyXK_e|hAXw!hmH7UZ2f8?)@2Uf}pQ6_MD2n#bNtC`YdsI={$8sw0G@%mQ zpt4Rsfx%(@QYNJ~6BYnc*WSy@zR9Am)8HF-2d9WH1CSB4)uD2z+Nkkv?=+vx z-+Td{$W*OmCxxad=zSjvSHXfK_h}JgbBkiYZQZ%pKrS{RPX;s5n^cytVRgs;Dl<`u z+8wKV=-8#EMgIU9dehmgHy?zvS$`BR+izzDz9>5O1@4QEeTDn#bRVreUt9#U=g|Uf zNqzS$z@3$^FTVZR^&u+~K>Msx#3{7I%sf8sdW6y29}c9})aOyQ4`k~U-lSYG**sN( zC)IhdGip~vOHuAy=Qp^f`e?%*!B~w%^-Y;r;!UAd+g+cRa#eZb+vV|EWkuBaVCas) z9iB*8=Iqw8CaK=;&o~o<9?~?>DkhDa^!PtJIl|3d!y9e

    e*}J9JZoD zf5qs}tD|7Sq^kT~;YbOdma`Luqx2QX6<;WW(d;vP%O1fEo?JXKP_ODS)NQw(6~M^q zAYiGq(efsm4)7GKj@v>yws)NYAEw|M0GOXKNkip{36r$zE4UeAQ}hgPY()w5F7 zA#1LR&UC)uJNZ>#?WBD+2s5$%Bjc!C`_rN5vHImmzWFakGCCJZC3E>#%ckA8q8<4a zPCIJWNzZgJQRDuUXZ1f`)&0bEo)(5HJPDMP!|HM{Xs+#)9XVBhVBXUQCE7DzmwKgn z*6_oDYUl>S?biR71lJkX)<)8X6V9M_TNL<6?}_>>kumhY>Q&IKo2_6`QoX4!%6Lt2 z))}_DLN^V*#*yh_u6w7OF06~Xx}LkbuL0CW3CFv^h>lvbs5PKB#&RO_)8SJW0K1}d zG_>xylR%*Ni77ppRhJ4m(A5ReP&NX09U$uF1CjBr0@Mg_U3 zM7AYHk_S&R0r=<4cTr_Te{YGiUGjy_XkQb^t}omT6`LZJdrdy4V6BZN`4%i?5oKZT J{2L-y$6kWF;>7>} diff --git a/src/librarian/font-optimizer/.hg/store/data/obfuscate-font.pl.i b/src/librarian/font-optimizer/.hg/store/data/obfuscate-font.pl.i deleted file mode 100644 index 7853c729494f7962bd11228a3eae6104aef2a99f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1432 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 p={ikl zHT=E*!!IK#p&!<&K!X_#SpQj}{5m&0e{X7l(+|?%rxzburXjTfD`)YM4(FGTAhm2U z##L{L1%+dm*?zp5ZK2`0zni|vl1#Is(m4+1SiJH5aDmk*!2iO%y7mdt-SojR(Y$8$ zSx#(s*c@YTT&OTtA5{!(^1wZDqbS=CQdqxd)`9t)h2zAh4fcvzHKJt&(LMUgEmTXX zB)7W;4AF-3l3)#L*P5}L@L6rv#TL&UqM92l$)aXsuZS=L48@tU7A`7*W#)>rkH+oB zeoCG7xqKcT&Ysb#&gRa$ut8d!xG5M7FvH zEf&3nxo_k7W{%IME^P&?rN6B5>6q>$i|%;k|i&gm7=&fCgSj?Hg!VrL#t(K9Um7=B~l#HFv%%ua~edeJP65!`(T{NLwX8 z+i0jB@<1$+?K)tuDk56K7eJ5+0A%vlRe8?+ieAX{a29Y~lU?Nehiu62H9CbQ_}ZWqz>*TJyS z@KaTJ?sP%u?Yf+zZDjrJsnvlfrgp4ua zcVQpQcIZfDJTMWiU?q6e!_u*`)WJKLGd|qDH^3~&K$*(KU!u$N%$`XlF5|CJaOhHB z=`Ps?6H%cg#b-y#v!Z_=aO0#?5;+Z=UJ09Tc27D|@H6waW$E zm5FYNFlKqY7a8yJdVzhIdPCwx4DS)`z(PrFFhqj=6zY2P+xY>xG}NDEUY6{nTpOXX z#6*0+F=BQuL}gp-@jy6O3lNFghm5jUC(z zw#@TCdfA6$Oq*PW_H`cQ?*7CeH(Gf+=G;V#x^huc+7Lt|HmNE;du7_})C?gL9ZX>S zfQTJm5-9wts!aeOH@tEHKzgZH2T6;ftS}fTGDd(o5=K7@R;*7+*t=~A($Z22k2#Pc=Yvi>}-|2)QYtywps)huNk!52%;Im#rkU$*V4 z-yCl^r}idvIF?UWi5MrLjJ7x?6b!mor?C z$0g@scEv{4YxlZbx1-kSC-JW=hZns<@ZU`0jc0-&0HCbJyGxK=E+YJP_%Zva1E3XpQUs1bBMA;B|`P$%E*0eOhzaCfhfsSU4uI{|;kxCkMtuBrXVyC4${MM85Z*);~hBE@f`9d;{vYz^U1 zF&*^+p50!YvQy=PzUEno!fc^&l{;qUUC})*k$R7{U2KmJvTacOPtu;mIh^F1qr%G} z<_#;>VhTRn-!ze{Q6j({b9~_{YVIojP1^1~ah~4^;ZldE=;+ighu<*WU zdNCSo5h*LpHYnGG!GWaiX=#fn(JO(EXR@!mKWG;f5dF&i1>1yn-hDyd-xxwY*H^tQ zX!1+TO&o?~f{=9`8tf<0@HU0j>>HA8-(l~MHK-b{3HCW(9A0N!5ebdoG2-@WF_pTP zNrHfch-4}-PmpkQvMO%5&+3?LijT%y&^RYZoUcOGv!Cl ztz)%FKMlg=D}tFG2%v{C8-AEJBBQP}u!tbG0)ET=l0M1>&Z) ziT)M!=3u@FC(PQ>Q5GGpnJ|iqV?|*i3`~3dEq(9i(^7M0PP9HwIpGgJ)8f9nf9g2F zt8Lv7>Pwy~w(~p1a9&x2mhtNbi{jfj zXd4g1SOVMh%c;3IaAuc0~zwM=(vjBDVB1cR=Xd>R$XzN(@gLz dR!Oa9Slx-GL^<;OL>6AU^0~_`s(||T{{Wb;W?=vT diff --git a/src/librarian/font-optimizer/.hg/store/data/t/subsetter.pl.i b/src/librarian/font-optimizer/.hg/store/data/t/subsetter.pl.i deleted file mode 100644 index 122eaa28ec17b9c0692fdef1102de1e19c65d7d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;;&0RRC20000000Jlg00vP200000000gD|NsC0|Ns9l+CfK%$Ef#V!5rBV z(%XJZh3P2(00000000000001ZoV`>{Z`&{oz2{eOP6|6i8pr9d4;R~|KyK@0>8(H@ z+svZHkvvJR(*^$Tqa|ngT($v2eKAGyJ(1?4yRX7ht1#grEKud0PN@;JQ9L!b)~=Wm zTzu8HE;L1L;`p;v2;Zwf$XSsy(Qkt}Pr%2u2`5sR>*;h7lE-&EjVq47l!-=TP&wy= z;Hk_oj_;*fv7G-vV(QvUz$}=73W19>FEfO6!4yjgszD%Tn892sTPjrtsT5DB40(-& z`^jCW39g=@M+p#gfF6%~17|$0G2PnyalIMcj7Ie?=+6AWk$k9K;C=g!2moE+(y#&D zzM?Nkg+Rs`D%4!>J6T#9bY$A1$2Tp@JI8X6ok;@;=CV3=vP3=|&=7n}cb>)~&T{{1 zEyB0a5ern@EdBw1+{_ODr#1*Tj>d_@F`A=Ma@Fa>#)j?qwt|6=H1_ILMs4C%BM(hU zJH+)TTo+7avx*54#>{2}jUf6C)<`5+u>z#Z2B3?a8wkUJ)y%er=8?;wXTh7^tR8^Z z*x(HVU6A(79Q>=%o3&54S%2t}URzOuPdVQtoqeEabI}G)F;GJ(3YIRxe|YV;w+}tv zYpbj;)_S@@WKQl}o0poPBzWmY>ci#MMX9(f_5Nxzg~B)6rO(c-F>BZNrDW2;D8(Im zWHn!qC?Y$Q-{|M>voB6?PpDcd1513?Z4<}CZLgxyl7(sWE4)14Iqlm2pYTu8D(YOb C&MDgf diff --git a/src/librarian/font-optimizer/.hg/store/fncache b/src/librarian/font-optimizer/.hg/store/fncache deleted file mode 100644 index f8f8690..0000000 --- a/src/librarian/font-optimizer/.hg/store/fncache +++ /dev/null @@ -1,94 +0,0 @@ -data/.hgignore.i -data/Font/EOTWrapper.pm.i -data/Font/Subsetter.pm.i -data/Font/Subsetter/NormalizationData.pm.i -data/Font/Subsetter/create-data.pl.i -data/LICENSE.i -data/README.txt.i -data/convert-eot.pl.i -data/ext/Font-TTF/.cvsignore.i -data/ext/Font-TTF/COPYING.i -data/ext/Font-TTF/Changes.i -data/ext/Font-TTF/MANIFEST.SKIP.i -data/ext/Font-TTF/Makefile.PL.i -data/ext/Font-TTF/README.TXT.i -data/ext/Font-TTF/TODO.i -data/ext/Font-TTF/lib/Font/TTF.pm.i -data/ext/Font-TTF/lib/Font/TTF/AATKern.pm.i -data/ext/Font-TTF/lib/Font/TTF/AATutils.pm.i -data/ext/Font-TTF/lib/Font/TTF/Anchor.pm.i -data/ext/Font-TTF/lib/Font/TTF/Bsln.pm.i -data/ext/Font-TTF/lib/Font/TTF/Changes.i -data/ext/Font-TTF/lib/Font/TTF/Cmap.pm.i -data/ext/Font-TTF/lib/Font/TTF/Coverage.pm.i -data/ext/Font-TTF/lib/Font/TTF/Cvt_.pm.i -data/ext/Font-TTF/lib/Font/TTF/Delta.pm.i -data/ext/Font-TTF/lib/Font/TTF/Dumper.pm.i -data/ext/Font-TTF/lib/Font/TTF/EBDT.pm.i -data/ext/Font-TTF/lib/Font/TTF/EBLC.pm.i -data/ext/Font-TTF/lib/Font/TTF/Fdsc.pm.i -data/ext/Font-TTF/lib/Font/TTF/Feat.pm.i -data/ext/Font-TTF/lib/Font/TTF/Fmtx.pm.i -data/ext/Font-TTF/lib/Font/TTF/Font.pm.i -data/ext/Font-TTF/lib/Font/TTF/Fpgm.pm.i -data/ext/Font-TTF/lib/Font/TTF/GDEF.pm.i -data/ext/Font-TTF/lib/Font/TTF/GPOS.pm.i -data/ext/Font-TTF/lib/Font/TTF/GSUB.pm.i -data/ext/Font-TTF/lib/Font/TTF/Glyf.pm.i -data/ext/Font-TTF/lib/Font/TTF/Glyph.pm.i -data/ext/Font-TTF/lib/Font/TTF/GrFeat.pm.i -data/ext/Font-TTF/lib/Font/TTF/Hdmx.pm.i -data/ext/Font-TTF/lib/Font/TTF/Head.pm.i -data/ext/Font-TTF/lib/Font/TTF/Hhea.pm.i -data/ext/Font-TTF/lib/Font/TTF/Hmtx.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern/ClassArray.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern/CompactClassArray.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern/OrderedList.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern/StateTable.pm.i -data/ext/Font-TTF/lib/Font/TTF/Kern/Subtable.pm.i -data/ext/Font-TTF/lib/Font/TTF/LTSH.pm.i -data/ext/Font-TTF/lib/Font/TTF/Loca.pm.i -data/ext/Font-TTF/lib/Font/TTF/Manual.pod.i -data/ext/Font-TTF/lib/Font/TTF/Maxp.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Contextual.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Insertion.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Ligature.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Noncontextual.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Rearrangement.pm.i -data/ext/Font-TTF/lib/Font/TTF/Mort/Subtable.pm.i -data/ext/Font-TTF/lib/Font/TTF/Name.pm.i -data/ext/Font-TTF/lib/Font/TTF/OS_2.pm.i -data/ext/Font-TTF/lib/Font/TTF/OTTags.pm.i -data/ext/Font-TTF/lib/Font/TTF/OldCmap.pm.i -data/ext/Font-TTF/lib/Font/TTF/OldMort.pm.i -data/ext/Font-TTF/lib/Font/TTF/PCLT.pm.i -data/ext/Font-TTF/lib/Font/TTF/PSNames.pm.i -data/ext/Font-TTF/lib/Font/TTF/Post.pm.i -data/ext/Font-TTF/lib/Font/TTF/Prep.pm.i -data/ext/Font-TTF/lib/Font/TTF/Prop.pm.i -data/ext/Font-TTF/lib/Font/TTF/Segarr.pm.i -data/ext/Font-TTF/lib/Font/TTF/Sill.pm.i -data/ext/Font-TTF/lib/Font/TTF/Table.pm.i -data/ext/Font-TTF/lib/Font/TTF/Ttc.pm.i -data/ext/Font-TTF/lib/Font/TTF/Ttopen.pm.i -data/ext/Font-TTF/lib/Font/TTF/Useall.pm.i -data/ext/Font-TTF/lib/Font/TTF/Utils.pm.i -data/ext/Font-TTF/lib/Font/TTF/Vhea.pm.i -data/ext/Font-TTF/lib/Font/TTF/Vmtx.pm.i -data/ext/Font-TTF/lib/Font/TTF/Win32.pm.i -data/ext/Font-TTF/lib/Font/TTF/XMLparse.pm.i -data/ext/Font-TTF/lib/ttfmod.pl.i -data/ext/Font-TTF/t/OFL.txt.i -data/ext/Font-TTF/t/tags.t.i -data/ext/Font-TTF/t/testfont.ttf.i -data/ext/Font-TTF/t/ttfcopy.t.i -data/gen-tests.pl.i -data/list-features.pl.i -data/modify-names.pl.i -data/obfuscate-font.pl.i -data/obfuscate-names.pl.i -data/subset.pl.i -data/t/subsetter.pl.i diff --git a/src/librarian/font-optimizer/.hg/store/undo b/src/librarian/font-optimizer/.hg/store/undo deleted file mode 100644 index d1ad357ca235cf737ffbce63202213b38f1d3c59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3869 zcmbVPZEu?}5Z>qgm*8mo1qqNQDha5#?e?j1zz}N&Bm1b5{rVkbQXmuE(T{M?`R=jr zb-Bz=qAsO2rKi3uzb==Rs8t~y^q;u^!Mszc%Gy|Y`?WDOurTJYRy2*YUQ^x4()Q>i zz=tAsFt!p}{T8519iXWX&S9CA0_39e$ZPb?T(tAULmJ+GJcX-ZA9`>eP{>UEE-fsi zfswL21M9dfINvZYdw2IlM*u%ge(nwrH&bJ2f01rNx?df3n=s{G`nXG`Fyfail$Kr+ zO(6bq<3IQWfX6{RA=2vDb7jbNbkQRgLlj%B_@lHn9o>S`jtZ}{lNpE3v?pt)sc!fm zzQc&0Ux|k3t#2@ZL@BB8cX%U01F7#KfBG7Nwz^NZX>hm>IMIi29r;A)CU+SXiWy6V zR&b_5F<+_BrmTq2hajY8#X}OO)Kk;vH5IBa1s&R)s93w9zrr@JsIRb)UD87V{$?hVta9>mfyXx)I02;44Z(WHjJwRRuz1g-uuBY zGyPP()~hILV__2=~VcmaH4xp&8 z6c5*>Q9%P1Z=&(0bSH-{{RWHFy%-n8qMOIi(nQ4vhO*2wm*Fv`tQUZ~m?eW%PGh57 x6gaM6aU4sKg(@zK`kGh+6>}_FmvxI_@5b=7o9JIP*RQ7|WcsX diff --git a/src/librarian/font-optimizer/.hg/tags.cache b/src/librarian/font-optimizer/.hg/tags.cache deleted file mode 100644 index b27879b..0000000 --- a/src/librarian/font-optimizer/.hg/tags.cache +++ /dev/null @@ -1,2 +0,0 @@ -28 136826b53242c388267996d1febb0fea90193a06 - diff --git a/src/librarian/font-optimizer/.hg/undo.branch b/src/librarian/font-optimizer/.hg/undo.branch deleted file mode 100644 index 331d858..0000000 --- a/src/librarian/font-optimizer/.hg/undo.branch +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file diff --git a/src/librarian/font-optimizer/.hg/undo.desc b/src/librarian/font-optimizer/.hg/undo.desc deleted file mode 100644 index 4f5da8a..0000000 --- a/src/librarian/font-optimizer/.hg/undo.desc +++ /dev/null @@ -1,3 +0,0 @@ -0 -pull -http://bitbucket.org/philip/font-optimizer diff --git a/src/librarian/font-optimizer/.hg/undo.dirstate b/src/librarian/font-optimizer/.hg/undo.dirstate deleted file mode 100644 index e69de29..0000000 diff --git a/src/librarian/font-optimizer/.hgignore b/src/librarian/font-optimizer/.hgignore deleted file mode 100644 index 5fe60d8..0000000 --- a/src/librarian/font-optimizer/.hgignore +++ /dev/null @@ -1,4 +0,0 @@ -~$ -^testoutput/ -^testfonts/ -^tmp/ diff --git a/src/librarian/font-optimizer/Font/EOTWrapper.pm b/src/librarian/font-optimizer/Font/EOTWrapper.pm deleted file mode 100644 index 297b930..0000000 --- a/src/librarian/font-optimizer/Font/EOTWrapper.pm +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright (c) 2009 Philip Taylor -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -package Font::EOTWrapper; - -use strict; -use warnings; - -use Font::TTF::Font; -use Encode; - -use constant TTEMBED_SUBSET => 0x00000001; -use constant TTEMBED_TTCOMPRESSED => 0x00000004; -use constant TTEMBED_XORENCRYPTDATA => 0x10000000; -use constant DEFAULT_CHARSET => 0x01; - -sub convert { - my ($in_fn, $out_fn) = @_; - - my $font_data = do { - open my $fh, $in_fn or die "Failed to open $in_fn: $!"; - binmode $fh; - local $/; - <$fh> - }; - - my $font = Font::TTF::Font->open($in_fn) or die "Failed to open $in_fn: $!"; - - open my $out, '>', $out_fn or die "Failed to open $out_fn: $!"; - binmode $out; - - $font->{name}->read if $font->{name}; - - my $os2 = $font->{'OS/2'}; - $os2->read; - - my $rootString = ''; - - my $header = ''; - $header .= pack V => length($font_data); - $header .= pack V => 0x00020001; - $header .= pack V => TTEMBED_SUBSET; - $header .= pack C10 => map $os2->{$_}, qw(bFamilyType bSerifStyle bWeight bProportion bContrast bStrokeVariation bArmStyle bLetterform bMidline bXheight); - $header .= pack C => DEFAULT_CHARSET; - $header .= pack C => (($os2->{fsSelection} & 1) ? 1 : 0); - $header .= pack V => $os2->{usWeightClass}; - $header .= pack v => $os2->{fsType}; - $header .= pack v => 0x504C; - $header .= pack VVVV => map $os2->{$_}, qw(ulUnicodeRange1 ulUnicodeRange2 ulUnicodeRange3 ulUnicodeRange4); - $header .= pack VV => map $os2->{$_}, qw(ulCodePageRange1 ulCodePageRange2); - $header .= pack V => $font->{head}{checkSumAdjustment}; - $header .= pack VVVV => 0, 0, 0, 0; - $header .= pack v => 0; - $header .= pack 'v/a*' => encode 'utf-16le' => $font->{name}->find_name(1); # family name - $header .= pack v => 0; - $header .= pack 'v/a*' => encode 'utf-16le' => $font->{name}->find_name(2); # style name - $header .= pack v => 0; - $header .= pack 'v/a*' => encode 'utf-16le' => $font->{name}->find_name(5); # version name - $header .= pack v => 0; - $header .= pack 'v/a*' => encode 'utf-16le' => $font->{name}->find_name(4); # full name - $header .= pack v => 0; - $header .= pack 'v/a*' => encode 'utf-16le' => $rootString; - - $out->print(pack V => 4 + length($header) + length($font_data)); - $out->print($header); - $out->print($font_data); - - $font->release; -} - -sub extract { - my ($in_fn, $out_fn) = @_; - - my $eot_data = do { - open my $fh, $in_fn or die "Failed to open $in_fn: $!"; - binmode $fh; - local $/; - <$fh> - }; - - die "Error: EOT too small" if length $eot_data < 16; - - my ($eot_size, $font_data_size, $version, $flags) = unpack VVVV => substr $eot_data, 0, 16; - - die "Error: Invalid EOTSize ($eot_size, should be ".(length $eot_data).")" if $eot_size != length $eot_data; - die "Error: Invalid Version ($version)" if not ($version == 0x00020000 or $version == 0x00020001 or $version == 0x00020002); - die "Error: Can't handle compressed fonts" if $flags & TTEMBED_TTCOMPRESSED; - - # Skip the header fields - my $rest = substr $eot_data, 16+66; - - my ($family_name, $style_name, $version_name, $full_name, $rest2) = unpack 'v/a* xx v/a* xx v/a* xx v/a* a*' => $rest; - - my $font_data; - if ($version == 0x00020000) { # not 0x00010000 - spec is wrong (http://lists.w3.org/Archives/Public/www-font/2009JulSep/0862.html) - $font_data = $rest2; - } elsif ($version == 0x00020001) { - my ($root, $data) = unpack 'xx v/a* a*' => $rest2; - $font_data = $data; - } elsif ($version == 0x00020002) { - my ($root, $root_checksum, $eudc_codepage, $signature, $eudc_flags, $eudc_font, $data) - = unpack 'xx v/a* V V xx v/a* V v/a* a*' => $rest2; - $font_data = $data; - } - - if ($flags & TTEMBED_XORENCRYPTDATA) { - $font_data ^= ("\x50" x length $font_data); - } - - open my $fh, '>', $out_fn or die "Failed to open $out_fn: $!"; - binmode $fh; - print $fh $font_data; -} - -# sub rootStringChecksum { -# my $s = 0; -# $s += $_ for unpack 'C*', $_[0]; -# return $s ^ 0x50475342; -# } - -1; diff --git a/src/librarian/font-optimizer/Font/Subsetter.pm b/src/librarian/font-optimizer/Font/Subsetter.pm deleted file mode 100644 index 7aa60dc..0000000 --- a/src/librarian/font-optimizer/Font/Subsetter.pm +++ /dev/null @@ -1,1606 +0,0 @@ -# Copyright (c) 2009 Philip Taylor -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -package Font::Subsetter; - -use strict; -use warnings; - -use Carp; -use Unicode::Normalize(); -use Digest::SHA qw(sha1_hex); -use Encode; - -use Font::TTF; -use Font::TTF::Font; - -if ($Font::TTF::VERSION =~ /^0\.([0-3].|4[0-5])$/) { - die "You are using an old version of Font::TTF ($Font::TTF::VERSION) - you need at least v0.46, and preferably the latest SVN trunk from ."; -} - -# Tables can be: -# REQUIRED - will fail if it's not present -# FORBIDDEN - will fail if it's present -# OPTIONAL - will be accepted regardless of whether it's there or not -# IGNORED - like OPTIONAL, but no processing will take place -# UNFINISHED - will emit a warning if it's present, because the code doesn't handle it properly yet -# DROP - will be deleted from the font -# The default for unmentioned tables is FORBIDDEN -my %font_tables = ( - 'cmap' => ['REQUIRED'], - 'head' => ['REQUIRED'], - 'hhea' => ['REQUIRED'], - 'hmtx' => ['REQUIRED'], - 'maxp' => ['REQUIRED'], - 'name' => ['REQUIRED'], - 'OS/2' => ['REQUIRED'], - 'post' => ['REQUIRED'], - # TrueType outlines: - 'cvt ' => ['IGNORED'], - 'fpgm' => ['IGNORED'], - 'glyf' => ['IGNORED'], - 'loca' => ['OPTIONAL'], - 'prep' => ['OPTIONAL'], - # PostScript outlines: (TODO: support these?) - 'CFF ' => ['FORBIDDEN'], - 'VORG' => ['FORBIDDEN'], - # Bitmap glyphs: (TODO: support these?) - 'EBDT' => ['DROP', 'embedded bitmap glyphs will be lost'], - 'EBLC' => ['DROP', 'embedded bitmap glyphs will be lost'], - 'EBSC' => ['DROP', 'embedded bitmap glyphs will be lost'], - # Advanced typographic tables: - 'BASE' => ['UNFINISHED'], - 'GDEF' => ['OPTIONAL'], - 'GPOS' => ['OPTIONAL'], - 'GSUB' => ['OPTIONAL'], - 'JSTF' => ['UNFINISHED'], - # OpenType tables: - 'DSIG' => ['DROP'], # digital signature - don't need it here - 'gasp' => ['IGNORED'], - 'hdmx' => ['OPTIONAL'], - 'kern' => ['OPTIONAL'], - 'LTSH' => ['OPTIONAL'], - 'PCLT' => ['UNFINISHED'], - 'VDMX' => ['IGNORED'], - 'vhea' => ['UNFINISHED'], - 'vmtx' => ['UNFINISHED'], - # SIL Graphite tables: - 'Feat' => ['DROP'], - 'Silf' => ['DROP'], - 'Sill' => ['DROP'], - 'Silt' => ['DROP'], - 'Glat' => ['DROP'], - 'Gloc' => ['DROP'], - # FontForge tables: - 'PfEd' => ['DROP'], - 'FFTM' => ['DROP'], - # Apple Advanced Typography tables: - # (These get dropped because it's better to use cross-platform features instead) - 'feat' => ['DROP'], - 'morx' => ['DROP'], - 'prop' => ['DROP'], - # Undocumented(?) extension for some kind of maths stuff - 'MATH' => ['DROP'], -); - -sub check_tables { - my ($self) = @_; - my $font = $self->{font}; - - my @tables = grep /^[^ ]...$/, sort keys %$font; - for (@tables) { - my $t = $font_tables{$_}; - if (not $t) { - die "Uses unrecognised table '$_'\n"; - } else { - my $status = $t->[0]; - if ($status eq 'FORBIDDEN') { - die "Uses forbidden table '$_'\n"; - } elsif ($status eq 'UNFINISHED') { - warn "Uses unhandled table '$_'\n"; - } elsif ($status eq 'DROP') { - my $note = ($t->[1] ? ' - '.$t->[1] : ''); - warn "Dropping table '$_'$note\n"; - delete $font->{$_}; - } elsif ($status eq 'OPTIONAL') { - } elsif ($status eq 'IGNORED') { - } elsif ($status eq 'REQUIRED') { - } else { - die "Invalid table status $status"; - } - } - } - # TODO: check required tables are present - # TODO: check TrueType or PostScript tables are present -} - -sub read_tables { - my ($self) = @_; - my $font = $self->{font}; - - # Read all the tables that will be needed in the future. - # (In particular, read them before modifying numGlyphs, - # beacuse they often depend on that value.) - for (qw( - cmap hmtx name OS/2 post - glyf loca - BASE GDEF GPOS GSUB JSTF - hdmx kern LTSH - )) { - $font->{$_}->read if $font->{$_}; - } -} - -sub find_codepoint_glyph_mappings { - my ($self) = @_; - my $font = $self->{font}; - - # Find the glyph->codepoint mappings - - my %glyphs; - for my $table (@{$font->{cmap}{Tables}}) { - for my $cp (keys %{$table->{val}}) { - - my $ucp; # Unicode code point - - if ($table->{Platform} == 0 # Unicode - or ($table->{Platform} == 3 and # Windows - ($table->{Encoding} == 1 or # Unicode BMP - $table->{Encoding} == 10)) # Unicode full - ) { - $ucp = $cp; - } elsif ($table->{Platform} == 1 # Mac - and $table->{Encoding} == 0) # Roman - { - $ucp = ord(decode('MacRoman', pack C => $cp)); - } else { - # This table might not map directly onto Unicode codepoints, - # so warn about it - warn "Unrecognised cmap table type (platform $table->{Platform}, encoding $table->{Encoding}) - ignoring its character/glyph mappings\n"; - next; - } - - my $g = $table->{val}{$cp}; # glyph id - $glyphs{$g}{$ucp} = 1; - } - } - $self->{glyphs} = \%glyphs; -} - -sub expand_wanted_chars { - my ($self, $chars) = @_; - # OS X browsers (via ATSUI?) appear to convert text into - # NFC before rendering it. - # So input like "i{combining grave}" is converted to "{i grave}" - # before it's even passed to the font's substitution tables. - # So if @chars contains i and {combining grave}, then we have to - # add {i grave} because that might get used. - # - # So... Include all the unchanged characters. Also include the NFC - # of each character. Then use NormalizationData to add any characters - # that can result from NFCing a string of the wanted characters. - - if (0) { # change to 1 to disable all this fancy stuff - my %cs = map { ord $_ => 1 } split '', $chars; - return %cs; - } - - my %cs = map { ord $_ => 1, ord Unicode::Normalize::NFC($_) => 1 } split '', $chars; - require Font::Subsetter::NormalizationData; - my %new_cs; - for my $c (@Font::Subsetter::NormalizationData::data) { - # Skip this if we've already got the composed character - next if $cs{$c->[0]}; - # Skip this if we don't have all the decomposed characters - next if grep !$cs{$_}, @{$c}[1..$#$c]; - # Otherwise we want the composed character - $new_cs{$c->[0]} = 1; - } - $cs{$_} = 1 for keys %new_cs; - return %cs; -} - -sub want_feature { - my ($self, $wanted, $feature) = @_; - # If no feature list was specified, accept all features - return 1 if not $wanted; - # Otherwise find the four-character tag - $feature =~ /^(\w{4})( _\d+)?$/ or die "Unrecognised feature tag syntax '$feature'"; - return $wanted->{$1} if exists $wanted->{$1}; - return $wanted->{DEFAULT} if exists $wanted->{DEFAULT}; - return 1; -} - -sub find_wanted_lookup_ids { - my ($self, $table) = @_; - - # If we wanted to include all lookups: - # return 0..$#{$table->{LOOKUP}}; - # but actually we only want ones used by wanted features - - my %lookups; - for my $feat_tag (@{$table->{FEATURES}{FEAT_TAGS}}) { - next if not $self->want_feature($self->{features}, $feat_tag); - for (@{$table->{FEATURES}{$feat_tag}{LOOKUPS}}) { - $lookups{$_} = 1; - } - } - - # Iteratively add any chained lookups - my $changed = 1; - while ($changed) { - $changed = 0; - for my $lookup_id (0..$#{$table->{LOOKUP}}) { - next unless $lookups{$lookup_id}; - my $lookup = $table->{LOOKUP}[$lookup_id]; - for my $sub (@{$lookup->{SUB}}) { - if ($sub->{ACTION_TYPE} eq 'l') { - for my $rule (@{$sub->{RULES}}) { - for my $chain (@$rule) { - for my $action (@{$chain->{ACTION}}) { - for (0..@$action/2-1) { - # action is array of (offset, lookup) - $changed = 1 if not $lookups{$action->[$_*2+1]}; - $lookups{$action->[$_*2+1]} = 1; - } - } - } - } - } - } - } - } - - my @keys = sort { $a <=> $b } keys %lookups; - return @keys; -} - -sub find_wanted_glyphs { - my ($self, $chars) = @_; - my $font = $self->{font}; - - my %wanted_chars = $self->expand_wanted_chars($chars); - $self->{wanted_glyphs} = {}; - - # http://www.microsoft.com/typography/otspec/recom.htm suggests that fonts - # should include .notdef, .null, CR, space; so include them all here, if they - # are already defined - if ($font->{post}{VAL}) { - for my $gid (0..$#{$font->{loca}{glyphs}}) { - my $name = $font->{post}{VAL}[$gid]; - if ($name and ($name eq '.notdef' or $name eq '.null' or $name eq 'CR' or $name eq 'space')) { - $self->{wanted_glyphs}{$gid} = 1; - } - } - } else { - # If post.FormatType == 3 then we don't have any glyph names - # so just assume it's the first four - $self->{wanted_glyphs}{$_} = 1 for 0..3; - } - - # We want any glyphs used directly by any characters we want - for my $gid (keys %{$self->{glyphs}}) { - for my $cp (keys %{$self->{glyphs}{$gid}}) { - $self->{wanted_glyphs}{$gid} = 1 if $wanted_chars{$cp}; - } - } - - # Iteratively find new glyphs, until convergence - my @newly_wanted_glyphs = keys %{$self->{wanted_glyphs}}; - while (@newly_wanted_glyphs) { - my @new_glyphs; - - if ($font->{GSUB}) { - - # Handle ligatures and similar things - # (e.g. if we want 'f' and 'i', we want the 'fi' ligature too) - # (NOTE: a lot of this code is duplicating the form of - # fix_gsub, so they ought to be kept roughly in sync) - # - # TODO: There's probably loads of bugs in here, so it - # should be checked and tested more - - for my $lookup_id ($self->find_wanted_lookup_ids($font->{GSUB})) { - my $lookup = $font->{GSUB}{LOOKUP}[$lookup_id]; - for my $sub (@{$lookup->{SUB}}) { - - # Handle the glyph-delta case - if ($sub->{ACTION_TYPE} eq 'o') { - my $adj = $sub->{ADJUST}; - if ($adj >= 32768) { $adj -= 65536 } # fix Font::TTF::Bug (http://rt.cpan.org/Ticket/Display.html?id=42727) - my @covs = $self->coverage_array($sub->{COVERAGE}); - for (@covs) { - # If we want the coveraged glyph, we also want - # that glyph plus delta - if ($self->{wanted_glyphs}{$_}) { - my $new = $_ + $adj; - next if $self->{wanted_glyphs}{$new}; - push @new_glyphs, $new; - $self->{wanted_glyphs}{$new} = 1; - } - } - next; - } - - # Collect the rules which might match initially something - my @rulesets; - if ($sub->{RULES}) { - if (($lookup->{TYPE} == 5 or $lookup->{TYPE} == 6) - and $sub->{FORMAT} == 2) { - # RULES corresponds to class values - # TODO: ought to filter this by classes that contain wanted glyphs - push @rulesets, @{$sub->{RULES}}; - } elsif (($lookup->{TYPE} == 5 or $lookup->{TYPE} == 6) - and $sub->{FORMAT} == 3) { - # COVERAGE is empty; accept all the RULEs, and - # we'll look inside their MATCHes later - push @rulesets, @{$sub->{RULES}}; - } else { - # COVERAGE lists glyphs, and there's a RULE for - # each, so extract the RULEs for wanted COVERAGE - # values - my @covs = $self->coverage_array($sub->{COVERAGE}); - die unless @{$sub->{RULES}} == @covs; - for my $i (0..$#covs) { - if ($self->{wanted_glyphs}{$covs[$i]}) { - push @rulesets, $sub->{RULES}[$i]; - } - } - } - } - - # Collect the rules whose MATCH matches - my @rules; - RULE: for my $rule (map @$_, @rulesets) { - if (not defined $sub->{MATCH_TYPE}) { - # No extra matching other than COVERAGE, - # so just accept this rule - } elsif ($sub->{MATCH_TYPE} eq 'g') { - # RULES->MATCH/PRE/POST are arrays of glyphs that must all match - for my $c (qw(MATCH PRE POST)) { - next unless $rule->{$c}; - next RULE if grep { not $self->{wanted_glyphs}{$_} } @{$rule->{$c}}; - } - } elsif ($sub->{MATCH_TYPE} eq 'o') { - # RULES->MATCH/PRE/POST are arrays of coverage tables, - # and at least one glyph from each table must match - die unless @{$sub->{RULES}} == 1; - die unless @{$sub->{RULES}[0]} == 1; - for my $c (qw(MATCH PRE POST)) { - next unless $sub->{RULES}[0][0]{$c}; - for (@{$sub->{RULES}[0][0]{$c}}) { - my $matched = 0; - for (keys %{$_->{val}}) { - if ($self->{wanted_glyphs}{$_}) { - $matched = 1; - last; - } - } - next RULE if not $matched; - } - } - } elsif ($sub->{MATCH_TYPE} eq 'c') { - # TODO: only includes rules using classes that contain - # wanted glyphs. - # For now, just conservatively accept everything. - } else { - die "Invalid MATCH_TYPE"; - } - push @rules, $rule; - } - - # Find the glyphs in the relevant actions - for my $rule (@rules) { - if ($sub->{ACTION_TYPE} eq 'g') { - die unless $rule->{ACTION}; - for my $new (@{$rule->{ACTION}}) { - next if $self->{wanted_glyphs}{$new}; - push @new_glyphs, $new; - $self->{wanted_glyphs}{$new} = 1; -# warn "adding $new"; - } - } elsif ($sub->{ACTION_TYPE} eq 'l') { - # do nothing - this is just a lookup to run some other rules - } elsif ($sub->{ACTION_TYPE} eq 'a') { - # do nothing - we don't want the alternative glyphs - } else { - die "Invalid ACTION_TYPE"; - } - } - } - } - } - - @newly_wanted_glyphs = @new_glyphs; - } - - # Now we want to add glyphs that are used for composite rendering, - # which don't participate in any GSUB behaviour - @newly_wanted_glyphs = keys %{$self->{wanted_glyphs}}; - while (@newly_wanted_glyphs) { - my @new_glyphs; - - if ($font->{loca}) { - # If we want a composite glyph, we want all of its - # component glyphs too - # (e.g. á is the 'a' glyph plus the acute glyph): - for my $gid (@newly_wanted_glyphs) { - my $glyph = $font->{loca}{glyphs}[$gid]; - next unless $glyph; - $glyph->read; - next unless $glyph->{numberOfContours} == -1; - $glyph->read_dat; - for (@{$glyph->{comps}}) { - next if $self->{wanted_glyphs}{$_->{glyph}}; - push @new_glyphs, $_->{glyph}; - $self->{wanted_glyphs}{$_->{glyph}} = 1; - } - $glyph->update; - } - } - - @newly_wanted_glyphs = @new_glyphs; - } -} - -sub update_classdef_table { - my ($self, $table) = @_; - die "Expected table" if not $table; - die "Expected classdef" if $table->{cover}; - my @vals; - for my $gid (keys %{$table->{val}}) { - next if not $self->{wanted_glyphs}{$gid}; - my $v = $table->{val}{$gid}; - push @vals, $self->{glyph_id_old_to_new}{$gid}, $v; - } - my $ret = new Font::TTF::Coverage(0, @vals); - # Font::TTF bug (http://rt.cpan.org/Ticket/Display.html?id=42716): - # 'max' is not set by new(), so do it manually: - my $max = 0; - for (values %{$ret->{val}}) { $max = $_ if $_ > $max } - $ret->{max} = $max; - return $ret; -} - -# Returns a map such that map[old_class_value] = new_class_value -# (or undef if the class is removed) -# This differs from update_classdef_table in that it can -# reorder and optimise the class ids -sub update_mapped_classdef_table { - my ($self, $table) = @_; - die "Expected table" if not $table; - die "Expected classdef" if $table->{cover}; - my @vals; - my %used_classes; - $used_classes{0} = 1; # 0 is implicitly in every classdef - for my $gid (keys %{$table->{val}}) { - next if not $self->{wanted_glyphs}{$gid}; - my $v = $table->{val}{$gid}; - push @vals, $self->{glyph_id_old_to_new}{$gid}, $v; - $used_classes{$v} = 1; - } - - my @map_new_to_old = sort { $a <=> $b } keys %used_classes; - my @map_old_to_new; - $map_old_to_new[$map_new_to_old[$_]] = $_ for 0..$#map_new_to_old; - - # Update the class numbers - for (0..@vals/2-1) { - $vals[$_*2+1] = $map_old_to_new[$vals[$_*2+1]]; - } - - my $ret = new Font::TTF::Coverage(0, @vals); - # Font::TTF bug (http://rt.cpan.org/Ticket/Display.html?id=42716): - # 'max' is not set by new(), so do it manually: - my $max = 0; - for (values %{$ret->{val}}) { $max = $_ if $_ > $max } - $ret->{max} = $max; - return ($ret, \@map_old_to_new, \@map_new_to_old); -} - -# Removes unwanted glyphs from a coverage table, for -# cases where nobody else is referring to indexes in this table -sub update_coverage_table { - my ($self, $table) = @_; - die "Expected table" if not $table; - die "Expected cover" if not $table->{cover}; - my @vals = keys %{$table->{val}}; - @vals = grep $self->{wanted_glyphs}{$_}, @vals; - @vals = sort { $a <=> $b } @vals; - @vals = map $self->{glyph_id_old_to_new}{$_}, @vals; - return new Font::TTF::Coverage(1, @vals); -} - -# Returns a map such that map[new_coverage_index] = old_coverage_index -sub update_mapped_coverage_table { - my ($self, $table) = @_; - die "Expected table" if not $table; - die "Expected coverage" if not $table->{cover}; - - my @map; - my @new_vals; - # Get the covered values (in order) - my @vals = $self->coverage_array($table); - for my $i (0..$#vals) { - # Create a new list of all the wanted values - if ($self->{wanted_glyphs}{$vals[$i]}) { - push @new_vals, $self->{glyph_id_old_to_new}{$vals[$i]}; - push @map, $i; - } - } - return (new Font::TTF::Coverage(1, @new_vals), @map); -} - -sub coverage_array { - my ($self, $table) = @_; - Carp::confess "Expected table" if not $table; - return sort { $table->{val}{$a} <=> $table->{val}{$b} } keys %{$table->{val}}; -} - -sub empty_coverage { - my ($self, $table) = @_; - Carp::confess "Expected table" if not $table; - return 1 if not $table->{val}; - return 1 if not keys %{$table->{val}}; - return 0; -} - -# Update the loca table to delete unwanted glyphs. -# Must be called before all the other fix_* methods. -sub remove_unwanted_glyphs { - my ($self) = @_; - my $font = $self->{font}; - - return unless $font->{loca}; - - my %glyph_id_old_to_new; - my %glyph_id_new_to_old; - - my $glyphs = $font->{loca}{glyphs}; - my @new_glyphs; - for my $i (0..$#$glyphs) { - if ($self->{wanted_glyphs}{$i}) { - push @new_glyphs, $glyphs->[$i]; - $glyph_id_old_to_new{$i} = $#new_glyphs; - $glyph_id_new_to_old{$#new_glyphs} = $i; - } - } - $font->{loca}{glyphs} = \@new_glyphs; - $font->{maxp}{numGlyphs} = scalar @new_glyphs; - - $self->{glyph_id_old_to_new} = \%glyph_id_old_to_new; - $self->{glyph_id_new_to_old} = \%glyph_id_new_to_old; -} - - -# Only the platform=3 encoding=1 cmap is really needed -# (for Windows, OS X, Linux), so save space (and potentially -# enhance cross-platformness) by stripping out all the others. -# (But keep platform=3 encoding=10 too, for UCS-4 characters.) -# (And Opera 10 on OS X wants one with platform=0 too.) -sub strip_cmap { - my ($self) = @_; - my $font = $self->{font}; - - if (not grep { $_->{Platform} == 3 and $_->{Encoding} == 1 } @{$font->{cmap}{Tables}}) { - warn "No cmap found with platform=3 encoding=1 - the font is likely to not work on Windows.\n"; - # Stop now, instead of stripping out all of the cmap tables - return; - } - - my @matched_tables = grep { - ($_->{Platform} == 3 and ($_->{Encoding} == 1 || $_->{Encoding} == 10)) - or ($_->{Platform} == 0) - } @{$font->{cmap}{Tables}}; - - $font->{cmap}{Tables} = \@matched_tables; -} - -# Only the platform=3 encoding=1 names are really needed -# (for Windows, OS X, Linux), so save space (and potentially -# enhance cross-platformness) by stripping out all the others. -sub strip_name { - my ($self) = @_; - my $font = $self->{font}; - - for my $id (0..$#{$font->{name}{strings}}) { - my $str = $font->{name}{strings}[$id]; - next if not $str; - my $plat = 3; - my $enc = 1; - my $langs = $str->[$plat][$enc]; - if (not $langs) { - warn "No name found with id=$id with platform=3 encoding=1 - the font is likely to not work on Windows.\n" - unless $id == 18; # warn except for some Mac-specific names - return; - } - $font->{name}{strings}[$id] = []; - $font->{name}{strings}[$id][$plat][$enc] = $langs; - # NOTE: this keeps all the languages for each string, which is - # potentially wasteful if there are lots (but in practice most fonts - # seem to only have English) - } -} - -sub fix_cmap { - my ($self) = @_; - my $font = $self->{font}; - - # Delete mappings for unwanted glyphs - - for my $table (@{$font->{cmap}{Tables}}) { - # (Already warned about unrecognised table types - # in find_codepoint_glyph_mappings) - my %new_vals; - for my $cp (keys %{$table->{val}}) { - my $gid = $table->{val}{$cp}; - if ($self->{wanted_glyphs}{$gid}) { - $new_vals{$cp} = $self->{glyph_id_old_to_new}{$gid}; - } - } - $table->{val} = \%new_vals; - if ($table->{Format} == 0) { - @{$table->{val}}{0..255} = map { defined($_) ? $_ : 0 } @{$table->{val}}{0..255}; - } - } -} - -sub fix_head { - # TODO: Should think about: - # created - # modified - # xMin (depends on glyph data) - # yMin (depends on glyph data) - # xMax (depends on glyph data) - # yMax (depends on glyph data) -} - -sub fix_hhea { - # TODO: Should think about: - # advanceWidthMax (depends on hmtx) - # minLeftSideBearing (depends on hmtx) - # minRightSideBearing (depends on hmtx) - # xMaxExtent (depends on hmtx) -} - -sub fix_hmtx { - my ($self) = @_; - my $font = $self->{font}; - - # Map the advance/lsb arrays from old to new glyph ids - my @new_advances; - my @new_lsbs; - for my $gid (0..$font->{maxp}{numGlyphs}-1) { - push @new_advances, $font->{hmtx}{advance}[$self->{glyph_id_new_to_old}{$gid}]; - push @new_lsbs, $font->{hmtx}{lsb}[$self->{glyph_id_new_to_old}{$gid}]; - } - $font->{hmtx}{advance} = \@new_advances; - $font->{hmtx}{lsb} = \@new_lsbs; -} - -sub fix_maxp { # Must come after loca, prep, fpgm - my ($self) = @_; - my $font = $self->{font}; - - # Update some of the 'max' values that Font::TTF - # is capable of updating - $font->{maxp}->update; -} - -sub fix_os_2 { # Must come after cmap, hmtx, hhea, GPOS, GSUB - my ($self) = @_; - my $font = $self->{font}; - - # Update some of the metric values that Font::TTF - # is capable of updating - $font->{'OS/2'}->update; - - if ($font->{'OS/2'}{Version} >= 2) { - # TODO: handle cases where these are non-default - warn "Unexpected defaultChar $font->{'OS/2'}{defaultChar}\n" - unless $font->{'OS/2'}{defaultChar} == 0; - warn "Unexpected breakChar $font->{'OS/2'}{breakChar}\n" - unless $font->{'OS/2'}{breakChar} == 0x20; - } -} - -sub fix_post { - my ($self) = @_; - my $font = $self->{font}; - - if ($font->{post}{FormatType} == 0) { - warn "Invalid 'post' table type. (If you're using the obfuscate-font.pl script, make sure it comes *after* the subsetting.)\n"; - } - - # Update PostScript name mappings for new glyph ids - if ($font->{post}{VAL}) { - my @new_vals; - for my $gid (0..$font->{maxp}{numGlyphs}-1) { - push @new_vals, $font->{post}{VAL}[$self->{glyph_id_new_to_old}{$gid}]; - } - $font->{post}{VAL} = \@new_vals; - } -} - - - - -sub fix_loca { - my ($self) = @_; - my $font = $self->{font}; - - # remove_unwanted_glyphs has already removed some - # of the glyph data from this table - - # Update references inside composite glyphs - for my $glyph (@{$font->{loca}{glyphs}}) { - next unless $glyph; - $glyph->read; - next unless $glyph->{numberOfContours} == -1; - $glyph->read_dat; - for (@{$glyph->{comps}}) { - # (find_unwanted_glyphs guarantees that the - # component glyphs will be present) - $_->{glyph} = $self->{glyph_id_old_to_new}{$_->{glyph}}; - } - } -} - - - -sub fix_gdef { - my ($self) = @_; - my $font = $self->{font}; - - if ($font->{GDEF}{GLYPH}) { - $font->{GDEF}{GLYPH} = $self->update_classdef_table($font->{GDEF}{GLYPH}); - if ($self->empty_coverage($font->{GDEF}{GLYPH})) { - delete $font->{GDEF}{GLYPH}; - } - } - - if ($font->{GDEF}{MARKS}) { - $font->{GDEF}{MARKS} = $self->update_classdef_table($font->{GDEF}{MARKS}); - if ($self->empty_coverage($font->{GDEF}{MARKS})) { - delete $font->{GDEF}{MARKS}; - } - } - - if ($font->{GDEF}{ATTACH}) { - die "TODO" if $font->{GDEF}{ATTACH}{POINTS}; - $font->{GDEF}{ATTACH}{COVERAGE} = $self->update_coverage_table($font->{GDEF}{ATTACH}{COVERAGE}); - if ($self->empty_coverage($font->{GDEF}{ATTACH}{COVERAGE})) { - delete $font->{GDEF}{ATTACH}; - } - } - - if ($font->{GDEF}{LIG}) { - - if ($font->{GDEF}{LIG}{LIGS}) { - die "GDEF LIG LIGS != COVERAGE" if - @{$font->{GDEF}{LIG}{LIGS}} != keys %{$font->{GDEF}{LIG}{COVERAGE}{val}}; - - my @coverage_map; - ($font->{GDEF}{LIG}{COVERAGE}, @coverage_map) = $self->update_mapped_coverage_table($font->{GDEF}{LIG}{COVERAGE}); - $font->{GDEF}{LIG}{LIGS} = [ map $font->{GDEF}{LIG}{LIGS}[$_], @coverage_map ]; - - } else { - $font->{GDEF}{LIG}{COVERAGE} = $self->update_coverage_table($font->{GDEF}{LIG}{COVERAGE}); - } - - if ($self->empty_coverage($font->{GDEF}{LIG}{COVERAGE})) { - delete $font->{GDEF}{LIG}; - } - } - -} - -sub fix_ttopen { - my ($self, $table, $inner) = @_; - - my @lookups; - my %lookup_map; - for my $lookup_id ($self->find_wanted_lookup_ids($table)) { - my $lookup = $table->{LOOKUP}[$lookup_id]; - my @subtables; - for my $sub (@{$lookup->{SUB}}) { - if ($inner->($lookup, $sub)) { - push @subtables, $sub; - } - } - - # Only keep lookups that have some subtables - if (@subtables) { - $lookup->{SUB} = \@subtables; - push @lookups, $lookup; - $lookup_map{$lookup_id} = $#lookups; - } - } - - $table->{LOOKUP} = \@lookups; - - # Update lookup references inside actions - for my $lookup (@{$table->{LOOKUP}}) { - for my $sub (@{$lookup->{SUB}}) { - if ($sub->{ACTION_TYPE} eq 'l') { - for my $rule (@{$sub->{RULES}}) { - for my $chain (@$rule) { - my @actions; - for my $action (@{$chain->{ACTION}}) { - my @steps; - for (0..@$action/2-1) { - # action is array of (offset, lookup) - # so just update the lookup - if (exists $lookup_map{$action->[$_*2+1]}) { - push @steps, ($action->[$_*2], $lookup_map{$action->[$_*2+1]}); - } - } - push @actions, \@steps; - } - $chain->{ACTION} = \@actions; - } - } - } - } - } - - # Remove all features that are not wanted - # and update all references to those features (in the languages list), - # and update the features' lookup references - - my @features; # array of [tag, feature] - my %kept_features; - for my $feat_tag (@{$table->{FEATURES}{FEAT_TAGS}}) { - next unless $self->want_feature($self->{features}, $feat_tag); # drop unwanted features - my $feat = $table->{FEATURES}{$feat_tag}; - $feat->{LOOKUPS} = [ map { exists $lookup_map{$_} ? ($lookup_map{$_}) : () } @{$feat->{LOOKUPS}} ]; - next unless @{$feat->{LOOKUPS}}; # drop empty features to save some space - push @features, [ $feat_tag, $feat ]; - $kept_features{$feat_tag} = 1; - } - - $table->{FEATURES} = { - FEAT_TAGS => [map $_->[0], @features], - map +($_->[0] => $_->[1]), @features, - }; - - # Remove any references from scripts to features that no longer exist - for my $script_tag (keys %{$table->{SCRIPTS}}) { - my $script = $table->{SCRIPTS}{$script_tag}; - for my $tag ('DEFAULT', @{$script->{LANG_TAGS}}) { - next if $script->{$tag}{' REFTAG'}; # ignore langs that are just copies of another - $script->{$tag}{FEATURES} = [ - grep $kept_features{$_}, @{$script->{$tag}{FEATURES}} - ]; - - } - } - - # TODO: it'd be nice to delete languages that have no features - -} - -sub fix_gpos { - my ($self) = @_; - my $font = $self->{font}; - - $self->fix_ttopen($font->{GPOS}, - sub { - my ($lookup, $sub) = @_; - - # There's always a COVERAGE here first. - # (If it's empty, the client will skip the entire subtable, - # so we could delete it entirely, but that would involve updating - # the FEATURES->*->LOOKUPS lists too, so don't do that yet.) - # - # The rest depends on Type: - # - # Lookup Type 1 (Single Adjustment Positioning Subtable): - # Format 1: Just COVERAGE, applies same value to all - # Format 2: Just COVERAGE, RULES[n] gives value for each - # - # Lookup Type 2 (Pair Adjustment Positioning Subtable): - # Format 1: COVERAGE gives first glyph, RULES[n][m]{MATCH}[0] gives second glyph - # Format 2: COVERAGE gives first glyph, CLASS gives first glyph class, MATCH[0] gives second glyph class - # - # Lookup Type 3 (Cursive Attachment Positioning Subtable): - # Format 1: Just COVERAGE, RULES[n] gives value for each - # - # Lookup Type 4 (MarkToBase Attachment Positioning Subtable): - # Format 1: MATCH[0] gives mark coverage, COVERAGE gives base coverage, MARKS[n] per mark, RULES[n] per base - # - # Lookup Type 5 (MarkToLigature Attachment Positioning Subtable): - # Format 1: pretty much the same as 4, but s/base/ligature/ - # - # Lookup Type 6 (MarkToMark Attachment Positioning Subtable): - # Format 1: pretty much the same as 4, but s/base/mark/ - # - # Lookup Type 7 (Contextual Positioning Subtables): - # Format 1: COVERAGE gives first glyph, RULES[n][m]{MATCH}[o] gives next glyphs - # Format 2: COVERAGE gives first glyph, CLASS gives classes to glyphs, RULES[n] is per class - # Format 3: COVERAGE absent, RULES[0][0]{MATCH}[o] gives glyph coverages - # - # Lookup Type 8 (Chaining Contextual Positioning Subtable): - # Format 1: COVERAGE gives first glyph, RULES[n][m]{PRE/MATCH/POST} give context glyphs - # Format 2: COVERAGE gives first glyph, PRE_CLASS/CLASS/POST_CLASS give classes - # Format 3: COVERAGE absent, RULES[0][0]{PRE/MATCH/POST}[o] give coverages - # - # Lookup Type 9 (Extension Positioning): - # Not supported - - die if $lookup->{TYPE} >= 9; - - # Update the COVERAGE table, and remember some mapping - # information to update things that refer to the table - my @coverage_map; - my $old_coverage_count; - if ($sub->{COVERAGE}) { - $old_coverage_count = scalar keys %{$sub->{COVERAGE}{val}}; - ($sub->{COVERAGE}, @coverage_map) = $self->update_mapped_coverage_table($sub->{COVERAGE}); - - # If there's no coverage left, then drop this subtable - return 0 if $self->empty_coverage($sub->{COVERAGE}); - } - - if ($sub->{RULES} and $sub->{COVERAGE} and not - # Skip cases where RULES is indexed by CLASS, not COVERAGE - (($lookup->{TYPE} == 2 or - $lookup->{TYPE} == 7 or - $lookup->{TYPE} == 8) - and $sub->{FORMAT} == 2) - ) { - # There's a RULES array per COVERAGE entry, so - # shuffle them around to match the new COVERAGE - if (@{$sub->{RULES}} != $old_coverage_count) { - die "Internal error: RULES ($sub->{RULES}) does not match COVERAGE ($sub->{COVERAGE}) -- " - . @{$sub->{RULES}} . " vs $old_coverage_count."; - } - $sub->{RULES} = [ map $sub->{RULES}[$_], @coverage_map ]; - } - - if (not defined $sub->{MATCH_TYPE} or $sub->{MATCH_TYPE} eq 'g') { - if ($sub->{MATCH}) { - die unless @{$sub->{MATCH}} == 1; - die unless $sub->{MARKS}; - die unless @{$sub->{MARKS}} == keys %{$sub->{MATCH}[0]{val}}; - my @match_map; - ($sub->{MATCH}[0], @match_map) = $self->update_mapped_coverage_table($sub->{MATCH}[0]); - - # If there's no coverage left, then drop this subtable - return 0 if $self->empty_coverage($sub->{MATCH}[0]); - - # Update MARKS to correspond to the new MATCH coverage - $sub->{MARKS} = [ map $sub->{MARKS}[$_], @match_map ]; - } - - # RULES->MATCH is an array of glyphs, so translate them all - for (@{$sub->{RULES}}) { - for (@$_) { - $_->{MATCH} = [ map $self->{glyph_id_old_to_new}{$_}, - grep $self->{wanted_glyphs}{$_}, @{$_->{MATCH}} ]; - } - } - } elsif ($sub->{MATCH_TYPE}) { - if ($sub->{MATCH_TYPE} eq 'o') { - # RULES->MATCH/PRE/POST are arrays of coverage tables, so translate them all - die unless @{$sub->{RULES}} == 1; - die unless @{$sub->{RULES}[0]} == 1; - my $r = $sub->{RULES}[0][0]; - for my $c (qw(MATCH PRE POST)) { - $r->{$c} = [ map $self->update_coverage_table($_), @{$r->{$c}} ] if $r->{$c}; - } - } elsif ($sub->{MATCH_TYPE} eq 'c') { - die "Didn't expect any rule matches" if grep $_->{MATCH}, map @$_, @{$sub->{RULES}}; - die unless @{$sub->{MATCH}} == 1; - - my $class_map; - ($sub->{CLASS}, undef, $class_map) = $self->update_mapped_classdef_table($sub->{CLASS}); - # Special case: If this results in an empty CLASS, it'll - # break in FF3.5 on Linux, so assign all the COVERAGE glyphs onto - # class 1 and update $class_map appropriately - if ($sub->{CLASS}{max} == 0) { - $sub->{CLASS} = new Font::TTF::Coverage(0, map +($_ => 1), keys %{$sub->{COVERAGE}{val}}); - $class_map = [0, 0]; # just duplicate class 0 into class 1 (this is a bit inefficient) - } - - $sub->{RULES} = [ @{$sub->{RULES}}[@$class_map] ]; - - # Update the MATCH classdef table - my $match_map; - ($sub->{MATCH}[0], undef, $match_map) = $self->update_mapped_classdef_table($sub->{MATCH}[0]); - - # If the MATCH table is now empty, drop this lookup - # (else FF3.5 on Linux drops the GPOS table entirely) - return 0 if @$match_map <= 1; - - # RULES[n] is a list of substitutions per MATCH class, so - # update all those lists for the new classdef - $sub->{RULES} = [ map { [ @{$_}[@$match_map] ] } @{$sub->{RULES}} ]; - - } else { - die "Invalid MATCH_TYPE"; - } - } - - if (($lookup->{TYPE} == 7 or - $lookup->{TYPE} == 8) - and $sub->{FORMAT} == 2) { - # Update some class tables - for my $c (qw(CLASS PRE_CLASS POST_CLASS)) { - $sub->{$c} = $self->update_classdef_table($sub->{$c}) if $sub->{$c}; - } - } - - return 1; - } - ); -} - -sub fix_gsub { - my ($self) = @_; - my $font = $self->{font}; - - $self->fix_ttopen($font->{GSUB}, - sub { - my ($lookup, $sub) = @_; - - # There's always a COVERAGE here first. - # (If it's empty, the client will skip the entire subtable, - # so we could delete it entirely, but that would involve updating - # the FEATURES->*->LOOKUPS lists and Contextual subtable indexes - # too, so don't do that yet.) - # - # The rest depends on Type: - # - # Lookup Type 1 (Single Substitution Subtable): - # Format 1: Just COVERAGE, and ADJUST gives glyph id delta - # Format 2: Just COVERAGE, then RULES[n]{ACTION}[0] gives replacement glyph for each - # - # Lookup Type 2 (Multiple Substitution Subtable): - # Format 1: Just COVERAGE, then RULES[n]{ACTION} gives replacement glyphs (must be at least 1) - # - # Lookup Type 3 (Alternate Substitution Subtable): - # Format 1: Just COVERAGE, then RULES[n]{ACTION} gives alternate glyphs - # [This can just be deleted since we have no way to use those glyphs] - # - # Lookup Type 4 (Ligature Substitution Subtable): - # Format 1: COVERAGE gives first glyph, RULES[n]{MATCH}[m] gives next glyphs to match, RULES[n]{ACTION}[0] gives replacement glyph - # - # Lookup Type 5 (Contextual Substitution Subtable): - # Format *: like type 7 in GPOS, but ACTION gives indexes into GSUB{LOOKUP} - # - # Lookup Type 6 (Chaining Contextual Substitution Subtable): - # Format *: like type 8 in GPOS, but ACTION gives indexes into GSUB{LOOKUP} - # - # Lookup Type 7 (Extension Substitution): - # Blah - - die if $lookup->{TYPE} >= 7; - - # Update the COVERAGE table, and remember some mapping - # information to update things that refer to the table - my @coverage_map; - my $old_coverage_count; - if ($sub->{COVERAGE}) { - $old_coverage_count = scalar keys %{$sub->{COVERAGE}{val}}; - ($sub->{COVERAGE}, @coverage_map) = $self->update_mapped_coverage_table($sub->{COVERAGE}); - - # If there's no coverage left, then drop this subtable - return 0 if $self->empty_coverage($sub->{COVERAGE}); - } - - if ($sub->{ACTION_TYPE} eq 'o') {; - my $adj = $sub->{ADJUST}; - if ($adj >= 32768) { $adj -= 65536 } # fix Font::TTF::Bug (http://rt.cpan.org/Ticket/Display.html?id=42727) - my @covs = $self->coverage_array($sub->{COVERAGE}); - if (@covs == 0) { - # Nothing's covered, but deleting this whole subtable is - # non-trivial so just zero it out - $sub->{ADJUST} = 0; - } elsif (@covs == 1) { - my $gid_base = $covs[0]; - my $old_gid_base = $self->{glyph_id_new_to_old}{$gid_base}; - my $old_gid = $old_gid_base + $adj; - $sub->{ADJUST} = $self->{glyph_id_old_to_new}{$old_gid} - $gid_base; - } else { - # The glyphs are probably all reordered, so we can't just - # adjust ADJUST. - # So switch this to a format 2 table: - $sub->{FORMAT} = 2; - $sub->{ACTION_TYPE} = 'g'; - delete $sub->{ADJUST}; - my @gids; - for (@covs) { - push @gids, $self->{glyph_id_old_to_new}{$self->{glyph_id_new_to_old}{$_} + $adj}; - } - $sub->{RULES} = [ map [{ACTION => [$_]}], @gids ]; - } - # Stop and keep this table, since done everything that's needed - return 1; - } - die if $sub->{ADJUST}; - - if ($sub->{RULES} and not - # Skip cases where RULES is indexed by CLASS, not COVERAGE, - # and cases where there's no COVERAGE at all - (($lookup->{TYPE} == 5 or $lookup->{TYPE} == 6) - and ($sub->{FORMAT} == 2 or $sub->{FORMAT} == 3)) - ) { - # There's a RULES array per COVERAGE entry, so - # shuffle them around to match the new COVERAGE - die unless @{$sub->{RULES}} == $old_coverage_count; - $sub->{RULES} = [ map $sub->{RULES}[$_], @coverage_map ]; - } - - # TODO: refactor - if ($sub->{MATCH_TYPE}) { - # Fix all the glyph indexes - if ($sub->{MATCH_TYPE} eq 'g') { - # RULES->MATCH/PRE/POST are arrays of glyphs, so translate them all, - # and if they rely on any unwanted glyphs then drop the rule entirely - for my $i (0..$#{$sub->{RULES}}) { - my $ruleset = $sub->{RULES}[$i]; - my @rules; - RULE: for my $rule (@$ruleset) { - for my $c (qw(MATCH PRE POST)) { - next unless $rule->{$c}; - next RULE if grep { not $self->{wanted_glyphs}{$_} } @{$rule->{$c}}; - $rule->{$c} = [ map $self->{glyph_id_old_to_new}{$_}, @{$rule->{$c}} ] - } - push @rules, $rule; - } - if (not @rules) { - # XXX: This is a really horrid hack. - # The proper solution is to delete the ruleset, - # and adjust COVERAGE to match. - push @rules, { ACTION => [0], MATCH => [-1] }; - } - $sub->{RULES}[$i] = \@rules; - } - } elsif ($sub->{MATCH_TYPE} eq 'o') { - # RULES->MATCH/PRE/POST are arrays of coverage tables, so translate them all - die unless @{$sub->{RULES}} == 1; - die unless @{$sub->{RULES}[0]} == 1; - my $r = $sub->{RULES}[0][0]; - for my $c (qw(MATCH PRE POST)) { - $r->{$c} = [ map $self->update_coverage_table($_), @{$r->{$c}} ] if $r->{$c}; - } - } elsif ($sub->{MATCH_TYPE} eq 'c') { - # RULES refers to class values, which haven't changed at all, - # so we don't need to update those values - } else { - die "Invalid MATCH_TYPE"; - } - } - - my %class_maps; - for my $c (qw(CLASS PRE_CLASS POST_CLASS)) { - ($sub->{$c}, $class_maps{$c}) = $self->update_mapped_classdef_table($sub->{$c}) if $sub->{$c}; - } - - - if ($sub->{MATCH_TYPE} and $sub->{MATCH_TYPE} eq 'c') { - # To make things work in Pango, we need to change all the - # class numbers so there aren't gaps: - my %classes = ( - MATCH => 'CLASS', - PRE => 'PRE_CLASS', - POST => 'POST_CLASS', - ); - my @rules; - for my $rule (@{$sub->{RULES}}) { - my @chains; - CHAIN: for my $chain (@$rule) { - for my $c (qw(MATCH PRE POST)) { - next unless $chain->{$c}; - my $map = $class_maps{$classes{$c}} or die "Got a $c but no $classes{$c}"; - # If any of the values are for a class that no longer has - # any entries, we should drop this whole chain because - # there's no chance it's going to match - next CHAIN if grep { not defined $map->[$_] } @{$chain->{$c}}; - # Otherwise just update the class numbers - $chain->{$c} = [ map $map->[$_], @{$chain->{$c}} ]; - } - push @chains, $chain; - } - push @rules, \@chains; - } - $sub->{RULES} = \@rules; - # If all the rules are empty, drop this whole subtable (which maybe is - # needed to avoid https://bugzilla.mozilla.org/show_bug.cgi?id=475242 ?) - return 0 if not grep @$_, @{$sub->{RULES}}; - } - - if ($sub->{ACTION_TYPE}) { - if ($sub->{ACTION_TYPE} eq 'g') { - for (@{$sub->{RULES}}) { - for (@$_) { - $_->{ACTION} = [ map $self->{glyph_id_old_to_new}{$_}, - grep $self->{wanted_glyphs}{$_}, @{$_->{ACTION}} ]; - } - } - } elsif ($sub->{ACTION_TYPE} eq 'l') { - # nothing to change here - } elsif ($sub->{ACTION_TYPE} eq 'a') { - # We don't want to bother with alternate glyphs at all, - # so just delete everything. - # (We need to have empty rules, and can't just delete them - # entirely, else FontTools becomes unhappy.) - # (TODO: Maybe we do want alternate glyphs? - # If so, be sure to update find_wanted_glyphs too) - for (@{$sub->{RULES}}) { - for (@$_) { - $_->{ACTION} = []; - } - } - } elsif ($sub->{ACTION_TYPE} eq 'o') { - die "Should have handled ACTION_TYPE o earlier"; - } else { - die "Invalid ACTION_TYPE"; - } - } - - return 1; - } - ); -} - -# Fold certain GSUB features into the cmap table -sub fold_gsub { - my ($self, $features) = @_; - - my $font = $self->{font}; - my $table = $font->{GSUB}; - - # Find the lookup IDs corresponding to the desired features - - my %wanted = (DEFAULT => 0); - $wanted{$_} = 1 for @$features; - - my %lookups; - for my $feat_tag (@{$table->{FEATURES}{FEAT_TAGS}}) { - next if not $self->want_feature(\%wanted, $feat_tag); - for (@{$table->{FEATURES}{$feat_tag}{LOOKUPS}}) { - $lookups{$_} = $feat_tag; - } - } - - # Find the glyph mapping from those lookups - - my %glyph_map; # (old glyph id => new glyph id) - - for my $lookup_id (0..$#{$table->{LOOKUP}}) { - next unless exists $lookups{$lookup_id}; - my $lookup = $table->{LOOKUP}[$lookup_id]; - if ($lookup->{TYPE} != 1) { - warn "GSUB lookup $lookup_id (from feature '$lookups{$lookup_id}') is not a 'single' type lookup (type=$lookup->{TYPE}), and cannot be applied.\n"; - next; - } - - # For each glyph, only the first substitution per lookup is applied, - # so we build a map of the firsts for this lookup (then fold it into - # the global map later) - my %lookup_glyph_map; - - for my $sub (@{$lookup->{SUB}}) { - my @covs = $self->coverage_array($sub->{COVERAGE}); - if ($sub->{ACTION_TYPE} eq 'o') { - my $adj = $sub->{ADJUST}; - if ($adj >= 32768) { $adj -= 65536 } # fix Font::TTF::Bug (http://rt.cpan.org/Ticket/Display.html?id=42727) - for my $i (0..$#covs) { - my $old = $covs[$i]; - my $new = $old + $adj; - $lookup_glyph_map{$old} = $new if not exists $lookup_glyph_map{$old}; - } - } elsif ($sub->{ACTION_TYPE} eq 'g') { - next if @covs == 0 and not $sub->{RULES}; - die unless @{$sub->{RULES}} == @covs; - for my $i (0..$#covs) { - my $old = $covs[$i]; - die unless @{$sub->{RULES}[$i]} == 1; - die unless @{$sub->{RULES}[$i][0]{ACTION}} == 1; - my $new = $sub->{RULES}[$i][0]{ACTION}[0]; - $lookup_glyph_map{$old} = $new; - } - } else { - die "Invalid ACTION_TYPE $sub->{ACTION_TYPE}"; - } - } - - # Fold the lookup's glyph map into the global glyph map - for my $gid (keys %lookup_glyph_map) { - # Add any new substitutions - $glyph_map{$gid} = $lookup_glyph_map{$gid} if not exists $glyph_map{$gid}; - } - for my $gid (keys %glyph_map) { - # Handle chained substitutions - $glyph_map{$gid} = $lookup_glyph_map{$glyph_map{$gid}} if exists $lookup_glyph_map{$glyph_map{$gid}}; - } - } - - # Apply the glyph mapping to cmap - - for my $table (@{$font->{cmap}{Tables}}) { - for my $cp (keys %{$table->{val}}) { - my $gid = $table->{val}{$cp}; - $table->{val}{$cp} = $glyph_map{$gid} if exists $glyph_map{$gid}; - } - } -} - -sub fix_hdmx { - my ($self) = @_; - my $font = $self->{font}; - - for my $ppem (grep /^\d+$/, keys %{$font->{hdmx}}) { - my @new_widths; - for my $gid (0..$font->{maxp}{numGlyphs}-1) { - push @new_widths, $font->{hdmx}{$ppem}[$self->{glyph_id_new_to_old}{$gid}]; - } - $font->{hdmx}{$ppem} = \@new_widths; - } -} - -sub fix_kern { - my ($self) = @_; - my $font = $self->{font}; - - # We don't handle version 1 kern tables yet, so just drop them entirely. - # http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6kern.html - # https://bugzilla.mozilla.org/show_bug.cgi?id=487549 - if ($font->{kern}{Version} != 0) { - warn "Unhandled kern table version $font->{kern}{Version} - deleting all kerning data\n"; - delete $font->{kern}; - return; - } - - for my $table (@{$font->{kern}{tables}}) { - if ($table->{type} == 0) { - my %kern; - for my $l (keys %{$table->{kern}}) { - next unless $self->{wanted_glyphs}{$l}; - for my $r (keys %{$table->{kern}{$l}}) { - next unless $self->{wanted_glyphs}{$r}; - $kern{$self->{glyph_id_old_to_new}{$l}}{$self->{glyph_id_old_to_new}{$r}} = $table->{kern}{$l}{$r}; - } - } - $table->{kern} = \%kern; - } elsif ($table->{type} == 2) { - die "kern table type 2 not supported yet"; - } else { - die "Invalid kern table type"; - } - } -} - -sub fix_ltsh { - my ($self) = @_; - my $font = $self->{font}; - - my @glyphs; - for my $gid (0..$font->{maxp}{numGlyphs}-1) { - push @glyphs, $font->{LTSH}{glyphs}[$self->{glyph_id_new_to_old}{$gid}]; - } - $font->{LTSH}{glyphs} = \@glyphs; -} - -sub delete_copyright { - my ($self) = @_; - my $font = $self->{font}; - # XXX - shouldn't be deleting copyright text - $font->{name}{strings}[0] = undef; - $font->{name}{strings}[10] = undef; - $font->{name}{strings}[13] = undef; -} - -sub change_name { - my ($self, $uid) = @_; - my $font = $self->{font}; - - for (1,3,4,6) { - my $str = $font->{name}{strings}[$_]; - for my $plat (0..$#$str) { - next unless $str->[$plat]; - for my $enc (0..$#{$str->[$plat]}) { - next unless $str->[$plat][$enc]; - for my $lang (keys %{$str->[$plat][$enc]}) { - next unless exists $str->[$plat][$enc]{$lang}; - $str->[$plat][$enc]{$lang} = "$uid - subset of " . $str->[$plat][$enc]{$lang}; - } - } - } - } -} - -sub license_desc_subst { - my ($self, $new) = @_; - my $font = $self->{font}; - - my $str = $font->{name}{strings}[13]; - for my $plat (0..$#$str) { - next unless $str->[$plat]; - for my $enc (0..$#{$str->[$plat]}) { - next unless $str->[$plat][$enc]; - for my $lang (keys %{$str->[$plat][$enc]}) { - next unless exists $str->[$plat][$enc]{$lang}; - $str->[$plat][$enc]{$lang} =~ s/\$\{LICENSESUBST\}/$new/g; - } - } - } -} - -# IE silently rejects non-CFF fonts if the Font Family Name is not a prefix of -# the Full Font Name. This can occur when automatically converting CFF fonts -# to non-CFF fonts, so it's useful to check and fix it here. -sub fix_full_font_name { - my ($self, $new) = @_; - my $font = $self->{font}; - - my $str1 = $font->{name}{strings}[1]; - for my $plat (0..$#$str1) { - next unless $str1->[$plat]; - for my $enc (0..$#{$str1->[$plat]}) { - next unless $str1->[$plat][$enc]; - for my $lang (keys %{$str1->[$plat][$enc]}) { - next unless exists $str1->[$plat][$enc]{$lang}; - my $name = $str1->[$plat][$enc]{$lang}; - my $fullname = $font->{name}{strings}[4][$plat][$enc]{$lang}; - if (substr($fullname, 0, length $name) ne $name) { - warn "Full Name ('$fullname') does not start with Family Name ('$name') and will break in IE - fixing automatically\n"; - $font->{name}{strings}[4][$plat][$enc]{$lang} = $name; - } - } - } - } -} - -sub new { - my $class = shift; - my $self = {}; - bless $self, $class; - return $self; -} - -sub preload { - my ($self, $filename) = @_; - my $font = Font::TTF::Font->open($filename) or die "Failed to open $filename: $!"; - $self->{font} = $font; - $self->read_tables; -} - -sub subset { - my ($self, $filename, $chars, $options) = @_; - - $self->{features} = $options->{features}; - - my $uid = substr(sha1_hex(encode_utf8("$filename $chars")), 0, 16); - - if (not $self->{font}) { - $self->preload($filename); - } - - my $font = $self->{font}; - - $self->check_tables; - - $self->{num_glyphs_old} = $font->{maxp}{numGlyphs}; - - $self->fold_gsub($options->{fold_features}) - if $options->{fold_features}; - - my $fsType = $font->{'OS/2'}{fsType}; - warn "fsType is $fsType - subsetting and embedding might not be permitted by the license\n" if $fsType != 0; - - $self->strip_cmap; - $self->strip_name; - - $self->find_codepoint_glyph_mappings; - $self->find_wanted_glyphs($chars); - $self->remove_unwanted_glyphs; - - $self->fix_cmap; - $self->fix_head; - $self->fix_hhea; - $self->fix_hmtx; - # name: nothing to fix (though maybe could be optimised?) - $self->fix_post; - - # cvt_: nothing to fix - # fpgm: nothing to fix - # glyf: just a stub, in Font::TTF - $self->fix_loca; - # prep: nothing to fix - - # BASE: TODO - $self->fix_gdef if $font->{GDEF}; - $self->fix_gpos if $font->{GPOS}; - $self->fix_gsub if $font->{GSUB}; - # JSTF: TODO - - $self->fix_hdmx if $font->{hdmx}; - $self->fix_kern if $font->{kern}; - $self->fix_ltsh if $font->{LTSH}; - - $self->fix_maxp; # Must come after loca, prep, fpgm - $self->fix_os_2; # Must come after cmap, hmtx, hhea, GPOS, GSUB - - $self->fix_full_font_name; - - $self->change_name($uid); - - $self->license_desc_subst($options->{license_desc_subst}) - if defined $options->{license_desc_subst}; - - $self->{num_glyphs_new} = $font->{maxp}{numGlyphs}; -} - -sub num_glyphs_old { - my ($self) = @_; - return $self->{num_glyphs_old}; -} - -sub num_glyphs_new { - my ($self) = @_; - return $self->{num_glyphs_new}; -} - -sub glyph_names { - my ($self) = @_; - my $font = $self->{font}; - if (@{$font->{post}{VAL}}) { - return @{$font->{post}{VAL}}; - } - my $n = $#{$font->{loca}{glyphs}}; - return join ' ', map { chr($_) =~ /[a-zA-Z0-9- \|]/ ? "'".chr($_)."'" : sprintf 'U+%04x', $_ } map { keys %{$self->{glyphs}{$_}} } - map $self->{glyph_id_new_to_old}{$_}, 0..$n; -} - -sub feature_status { - my ($self) = @_; - my $font = $self->{font}; - my %feats; - my @feats; - for my $table (grep defined, $font->{GPOS}, $font->{GSUB}) { - for my $feature (@{$table->{FEATURES}{FEAT_TAGS}}) { - $feature =~ /^(\w{4})( _\d+)?$/ or die "Unrecognised feature tag syntax '$feature'"; - my $tag = $1; - next if $feats{$tag}++; - push @feats, $tag; - } - } - return @feats; -} - -sub write { - my ($self, $fh) = @_; - my $font = $self->{font}; - $font->out($fh) or die $!; -} - -sub release { - my ($self) = @_; - my $font = $self->{font}; - $font->release; -} - -1; diff --git a/src/librarian/font-optimizer/Font/Subsetter/NormalizationData.pm b/src/librarian/font-optimizer/Font/Subsetter/NormalizationData.pm deleted file mode 100644 index dca81d6..0000000 --- a/src/librarian/font-optimizer/Font/Subsetter/NormalizationData.pm +++ /dev/null @@ -1,1377 +0,0 @@ -package Font::Subsetter::NormalizationData; -use strict; -use warnings; -our @data = ( -[192,65,768], -[193,65,769], -[194,65,770], -[195,65,771], -[196,65,776], -[197,65,778], -[199,67,807], -[200,69,768], -[201,69,769], -[202,69,770], -[203,69,776], -[204,73,768], -[205,73,769], -[206,73,770], -[207,73,776], -[209,78,771], -[210,79,768], -[211,79,769], -[212,79,770], -[213,79,771], -[214,79,776], -[217,85,768], -[218,85,769], -[219,85,770], -[220,85,776], -[221,89,769], -[224,97,768], -[225,97,769], -[226,97,770], -[227,97,771], -[228,97,776], -[229,97,778], -[231,99,807], -[232,101,768], -[233,101,769], -[234,101,770], -[235,101,776], -[236,105,768], -[237,105,769], -[238,105,770], -[239,105,776], -[241,110,771], -[242,111,768], -[243,111,769], -[244,111,770], -[245,111,771], -[246,111,776], -[249,117,768], -[250,117,769], -[251,117,770], -[252,117,776], -[253,121,769], -[255,121,776], -[256,65,772], -[257,97,772], -[258,65,774], -[259,97,774], -[260,65,808], -[261,97,808], -[262,67,769], -[263,99,769], -[264,67,770], -[265,99,770], -[266,67,775], -[267,99,775], -[268,67,780], -[269,99,780], -[270,68,780], -[271,100,780], -[274,69,772], -[275,101,772], -[276,69,774], -[277,101,774], -[278,69,775], -[279,101,775], -[280,69,808], -[281,101,808], -[282,69,780], -[283,101,780], -[284,71,770], -[285,103,770], -[286,71,774], -[287,103,774], -[288,71,775], -[289,103,775], -[290,71,807], -[291,103,807], -[292,72,770], -[293,104,770], -[296,73,771], -[297,105,771], -[298,73,772], -[299,105,772], -[300,73,774], -[301,105,774], -[302,73,808], -[303,105,808], -[304,73,775], -[308,74,770], -[309,106,770], -[310,75,807], -[311,107,807], -[313,76,769], -[314,108,769], -[315,76,807], -[316,108,807], -[317,76,780], -[318,108,780], -[323,78,769], -[324,110,769], -[325,78,807], -[326,110,807], -[327,78,780], -[328,110,780], -[332,79,772], -[333,111,772], -[334,79,774], -[335,111,774], -[336,79,779], -[337,111,779], -[340,82,769], -[341,114,769], -[342,82,807], -[343,114,807], -[344,82,780], -[345,114,780], -[346,83,769], -[347,115,769], -[348,83,770], -[349,115,770], -[350,83,807], -[351,115,807], -[352,83,780], -[353,115,780], -[354,84,807], -[355,116,807], -[356,84,780], -[357,116,780], -[360,85,771], -[361,117,771], -[362,85,772], -[363,117,772], -[364,85,774], -[365,117,774], -[366,85,778], -[367,117,778], -[368,85,779], -[369,117,779], -[370,85,808], -[371,117,808], -[372,87,770], -[373,119,770], -[374,89,770], -[375,121,770], -[376,89,776], -[377,90,769], -[378,122,769], -[379,90,775], -[380,122,775], -[381,90,780], -[382,122,780], -[416,79,795], -[417,111,795], -[431,85,795], -[432,117,795], -[461,65,780], -[462,97,780], -[463,73,780], -[464,105,780], -[465,79,780], -[466,111,780], -[467,85,780], -[468,117,780], -[469,85,776,772], -[469,220,772], -[470,117,776,772], -[470,252,772], -[471,85,776,769], -[471,220,769], -[472,117,776,769], -[472,252,769], -[473,85,776,780], -[473,220,780], -[474,117,776,780], -[474,252,780], -[475,85,776,768], -[475,220,768], -[476,117,776,768], -[476,252,768], -[478,65,776,772], -[478,196,772], -[479,97,776,772], -[479,228,772], -[480,65,775,772], -[480,550,772], -[481,97,775,772], -[481,551,772], -[482,198,772], -[483,230,772], -[486,71,780], -[487,103,780], -[488,75,780], -[489,107,780], -[490,79,808], -[491,111,808], -[492,79,808,772], -[492,332,808], -[492,490,772], -[493,111,808,772], -[493,333,808], -[493,491,772], -[494,439,780], -[495,658,780], -[496,106,780], -[500,71,769], -[501,103,769], -[504,78,768], -[505,110,768], -[506,65,778,769], -[506,197,769], -[507,97,778,769], -[507,229,769], -[508,198,769], -[509,230,769], -[510,216,769], -[511,248,769], -[512,65,783], -[513,97,783], -[514,65,785], -[515,97,785], -[516,69,783], -[517,101,783], -[518,69,785], -[519,101,785], -[520,73,783], -[521,105,783], -[522,73,785], -[523,105,785], -[524,79,783], -[525,111,783], -[526,79,785], -[527,111,785], -[528,82,783], -[529,114,783], -[530,82,785], -[531,114,785], -[532,85,783], -[533,117,783], -[534,85,785], -[535,117,785], -[536,83,806], -[537,115,806], -[538,84,806], -[539,116,806], -[542,72,780], -[543,104,780], -[550,65,775], -[551,97,775], -[552,69,807], -[553,101,807], -[554,79,776,772], -[554,214,772], -[555,111,776,772], -[555,246,772], -[556,79,771,772], -[556,213,772], -[557,111,771,772], -[557,245,772], -[558,79,775], -[559,111,775], -[560,79,775,772], -[560,558,772], -[561,111,775,772], -[561,559,772], -[562,89,772], -[563,121,772], -[901,168,769], -[902,913,769], -[904,917,769], -[905,919,769], -[906,921,769], -[908,927,769], -[910,933,769], -[911,937,769], -[912,953,776,769], -[912,970,769], -[938,921,776], -[939,933,776], -[940,945,769], -[941,949,769], -[942,951,769], -[943,953,769], -[944,965,776,769], -[944,971,769], -[970,953,776], -[971,965,776], -[972,959,769], -[973,965,769], -[974,969,769], -[979,978,769], -[980,978,776], -[1024,1045,768], -[1025,1045,776], -[1027,1043,769], -[1031,1030,776], -[1036,1050,769], -[1037,1048,768], -[1038,1059,774], -[1049,1048,774], -[1081,1080,774], -[1104,1077,768], -[1105,1077,776], -[1107,1075,769], -[1111,1110,776], -[1116,1082,769], -[1117,1080,768], -[1118,1091,774], -[1142,1140,783], -[1143,1141,783], -[1217,1046,774], -[1218,1078,774], -[1232,1040,774], -[1233,1072,774], -[1234,1040,776], -[1235,1072,776], -[1238,1045,774], -[1239,1077,774], -[1242,1240,776], -[1243,1241,776], -[1244,1046,776], -[1245,1078,776], -[1246,1047,776], -[1247,1079,776], -[1250,1048,772], -[1251,1080,772], -[1252,1048,776], -[1253,1080,776], -[1254,1054,776], -[1255,1086,776], -[1258,1256,776], -[1259,1257,776], -[1260,1069,776], -[1261,1101,776], -[1262,1059,772], -[1263,1091,772], -[1264,1059,776], -[1265,1091,776], -[1266,1059,779], -[1267,1091,779], -[1268,1063,776], -[1269,1095,776], -[1272,1067,776], -[1273,1099,776], -[1570,1575,1619], -[1571,1575,1620], -[1572,1608,1620], -[1573,1575,1621], -[1574,1610,1620], -[1728,1749,1620], -[1730,1729,1620], -[1747,1746,1620], -[2345,2344,2364], -[2353,2352,2364], -[2356,2355,2364], -[2507,2503,2494], -[2508,2503,2519], -[2888,2887,2902], -[2891,2887,2878], -[2892,2887,2903], -[2964,2962,3031], -[3018,3014,3006], -[3019,3015,3006], -[3020,3014,3031], -[3144,3142,3158], -[3264,3263,3285], -[3271,3270,3285], -[3272,3270,3286], -[3274,3270,3266], -[3275,3270,3266,3285], -[3275,3274,3285], -[3402,3398,3390], -[3403,3399,3390], -[3404,3398,3415], -[3546,3545,3530], -[3548,3545,3535], -[3549,3545,3535,3530], -[3549,3548,3530], -[3550,3545,3551], -[4134,4133,4142], -[7680,65,805], -[7681,97,805], -[7682,66,775], -[7683,98,775], -[7684,66,803], -[7685,98,803], -[7686,66,817], -[7687,98,817], -[7688,67,807,769], -[7688,262,807], -[7688,199,769], -[7689,99,807,769], -[7689,263,807], -[7689,231,769], -[7690,68,775], -[7691,100,775], -[7692,68,803], -[7693,100,803], -[7694,68,817], -[7695,100,817], -[7696,68,807], -[7697,100,807], -[7698,68,813], -[7699,100,813], -[7700,69,772,768], -[7700,274,768], -[7701,101,772,768], -[7701,275,768], -[7702,69,772,769], -[7702,274,769], -[7703,101,772,769], -[7703,275,769], -[7704,69,813], -[7705,101,813], -[7706,69,816], -[7707,101,816], -[7708,69,807,774], -[7708,276,807], -[7708,552,774], -[7709,101,807,774], -[7709,277,807], -[7709,553,774], -[7710,70,775], -[7711,102,775], -[7712,71,772], -[7713,103,772], -[7714,72,775], -[7715,104,775], -[7716,72,803], -[7717,104,803], -[7718,72,776], -[7719,104,776], -[7720,72,807], -[7721,104,807], -[7722,72,814], -[7723,104,814], -[7724,73,816], -[7725,105,816], -[7726,73,776,769], -[7726,207,769], -[7727,105,776,769], -[7727,239,769], -[7728,75,769], -[7729,107,769], -[7730,75,803], -[7731,107,803], -[7732,75,817], -[7733,107,817], -[7734,76,803], -[7735,108,803], -[7736,76,803,772], -[7736,7734,772], -[7737,108,803,772], -[7737,7735,772], -[7738,76,817], -[7739,108,817], -[7740,76,813], -[7741,108,813], -[7742,77,769], -[7743,109,769], -[7744,77,775], -[7745,109,775], -[7746,77,803], -[7747,109,803], -[7748,78,775], -[7749,110,775], -[7750,78,803], -[7751,110,803], -[7752,78,817], -[7753,110,817], -[7754,78,813], -[7755,110,813], -[7756,79,771,769], -[7756,213,769], -[7757,111,771,769], -[7757,245,769], -[7758,79,771,776], -[7758,213,776], -[7759,111,771,776], -[7759,245,776], -[7760,79,772,768], -[7760,332,768], -[7761,111,772,768], -[7761,333,768], -[7762,79,772,769], -[7762,332,769], -[7763,111,772,769], -[7763,333,769], -[7764,80,769], -[7765,112,769], -[7766,80,775], -[7767,112,775], -[7768,82,775], -[7769,114,775], -[7770,82,803], -[7771,114,803], -[7772,82,803,772], -[7772,7770,772], -[7773,114,803,772], -[7773,7771,772], -[7774,82,817], -[7775,114,817], -[7776,83,775], -[7777,115,775], -[7778,83,803], -[7779,115,803], -[7780,83,769,775], -[7780,346,775], -[7781,115,769,775], -[7781,347,775], -[7782,83,780,775], -[7782,352,775], -[7783,115,780,775], -[7783,353,775], -[7784,83,803,775], -[7784,7776,803], -[7784,7778,775], -[7785,115,803,775], -[7785,7777,803], -[7785,7779,775], -[7786,84,775], -[7787,116,775], -[7788,84,803], -[7789,116,803], -[7790,84,817], -[7791,116,817], -[7792,84,813], -[7793,116,813], -[7794,85,804], -[7795,117,804], -[7796,85,816], -[7797,117,816], -[7798,85,813], -[7799,117,813], -[7800,85,771,769], -[7800,360,769], -[7801,117,771,769], -[7801,361,769], -[7802,85,772,776], -[7802,362,776], -[7803,117,772,776], -[7803,363,776], -[7804,86,771], -[7805,118,771], -[7806,86,803], -[7807,118,803], -[7808,87,768], -[7809,119,768], -[7810,87,769], -[7811,119,769], -[7812,87,776], -[7813,119,776], -[7814,87,775], -[7815,119,775], -[7816,87,803], -[7817,119,803], -[7818,88,775], -[7819,120,775], -[7820,88,776], -[7821,120,776], -[7822,89,775], -[7823,121,775], -[7824,90,770], -[7825,122,770], -[7826,90,803], -[7827,122,803], -[7828,90,817], -[7829,122,817], -[7830,104,817], -[7831,116,776], -[7832,119,778], -[7833,121,778], -[7835,383,775], -[7840,65,803], -[7841,97,803], -[7842,65,777], -[7843,97,777], -[7844,65,770,769], -[7844,194,769], -[7845,97,770,769], -[7845,226,769], -[7846,65,770,768], -[7846,194,768], -[7847,97,770,768], -[7847,226,768], -[7848,65,770,777], -[7848,194,777], -[7849,97,770,777], -[7849,226,777], -[7850,65,770,771], -[7850,194,771], -[7851,97,770,771], -[7851,226,771], -[7852,65,803,770], -[7852,194,803], -[7852,7840,770], -[7853,97,803,770], -[7853,226,803], -[7853,7841,770], -[7854,65,774,769], -[7854,258,769], -[7855,97,774,769], -[7855,259,769], -[7856,65,774,768], -[7856,258,768], -[7857,97,774,768], -[7857,259,768], -[7858,65,774,777], -[7858,258,777], -[7859,97,774,777], -[7859,259,777], -[7860,65,774,771], -[7860,258,771], -[7861,97,774,771], -[7861,259,771], -[7862,65,803,774], -[7862,258,803], -[7862,7840,774], -[7863,97,803,774], -[7863,259,803], -[7863,7841,774], -[7864,69,803], -[7865,101,803], -[7866,69,777], -[7867,101,777], -[7868,69,771], -[7869,101,771], -[7870,69,770,769], -[7870,202,769], -[7871,101,770,769], -[7871,234,769], -[7872,69,770,768], -[7872,202,768], -[7873,101,770,768], -[7873,234,768], -[7874,69,770,777], -[7874,202,777], -[7875,101,770,777], -[7875,234,777], -[7876,69,770,771], -[7876,202,771], -[7877,101,770,771], -[7877,234,771], -[7878,69,803,770], -[7878,202,803], -[7878,7864,770], -[7879,101,803,770], -[7879,234,803], -[7879,7865,770], -[7880,73,777], -[7881,105,777], -[7882,73,803], -[7883,105,803], -[7884,79,803], -[7885,111,803], -[7886,79,777], -[7887,111,777], -[7888,79,770,769], -[7888,212,769], -[7889,111,770,769], -[7889,244,769], -[7890,79,770,768], -[7890,212,768], -[7891,111,770,768], -[7891,244,768], -[7892,79,770,777], -[7892,212,777], -[7893,111,770,777], -[7893,244,777], -[7894,79,770,771], -[7894,212,771], -[7895,111,770,771], -[7895,244,771], -[7896,79,803,770], -[7896,212,803], -[7896,7884,770], -[7897,111,803,770], -[7897,244,803], -[7897,7885,770], -[7898,79,795,769], -[7898,211,795], -[7898,416,769], -[7899,111,795,769], -[7899,243,795], -[7899,417,769], -[7900,79,795,768], -[7900,210,795], -[7900,416,768], -[7901,111,795,768], -[7901,242,795], -[7901,417,768], -[7902,79,795,777], -[7902,7886,795], -[7902,416,777], -[7903,111,795,777], -[7903,7887,795], -[7903,417,777], -[7904,79,795,771], -[7904,213,795], -[7904,416,771], -[7905,111,795,771], -[7905,245,795], -[7905,417,771], -[7906,79,795,803], -[7906,7884,795], -[7906,416,803], -[7907,111,795,803], -[7907,7885,795], -[7907,417,803], -[7908,85,803], -[7909,117,803], -[7910,85,777], -[7911,117,777], -[7912,85,795,769], -[7912,218,795], -[7912,431,769], -[7913,117,795,769], -[7913,250,795], -[7913,432,769], -[7914,85,795,768], -[7914,217,795], -[7914,431,768], -[7915,117,795,768], -[7915,249,795], -[7915,432,768], -[7916,85,795,777], -[7916,7910,795], -[7916,431,777], -[7917,117,795,777], -[7917,7911,795], -[7917,432,777], -[7918,85,795,771], -[7918,360,795], -[7918,431,771], -[7919,117,795,771], -[7919,361,795], -[7919,432,771], -[7920,85,795,803], -[7920,7908,795], -[7920,431,803], -[7921,117,795,803], -[7921,7909,795], -[7921,432,803], -[7922,89,768], -[7923,121,768], -[7924,89,803], -[7925,121,803], -[7926,89,777], -[7927,121,777], -[7928,89,771], -[7929,121,771], -[7936,945,787], -[7937,945,788], -[7938,945,787,768], -[7938,7936,768], -[7939,945,788,768], -[7939,7937,768], -[7940,945,787,769], -[7940,7936,769], -[7941,945,788,769], -[7941,7937,769], -[7942,945,787,834], -[7942,7936,834], -[7943,945,788,834], -[7943,7937,834], -[7944,913,787], -[7945,913,788], -[7946,913,787,768], -[7946,7944,768], -[7947,913,788,768], -[7947,7945,768], -[7948,913,787,769], -[7948,7944,769], -[7949,913,788,769], -[7949,7945,769], -[7950,913,787,834], -[7950,7944,834], -[7951,913,788,834], -[7951,7945,834], -[7952,949,787], -[7953,949,788], -[7954,949,787,768], -[7954,7952,768], -[7955,949,788,768], -[7955,7953,768], -[7956,949,787,769], -[7956,7952,769], -[7957,949,788,769], -[7957,7953,769], -[7960,917,787], -[7961,917,788], -[7962,917,787,768], -[7962,7960,768], -[7963,917,788,768], -[7963,7961,768], -[7964,917,787,769], -[7964,7960,769], -[7965,917,788,769], -[7965,7961,769], -[7968,951,787], -[7969,951,788], -[7970,951,787,768], -[7970,7968,768], -[7971,951,788,768], -[7971,7969,768], -[7972,951,787,769], -[7972,7968,769], -[7973,951,788,769], -[7973,7969,769], -[7974,951,787,834], -[7974,7968,834], -[7975,951,788,834], -[7975,7969,834], -[7976,919,787], -[7977,919,788], -[7978,919,787,768], -[7978,7976,768], -[7979,919,788,768], -[7979,7977,768], -[7980,919,787,769], -[7980,7976,769], -[7981,919,788,769], -[7981,7977,769], -[7982,919,787,834], -[7982,7976,834], -[7983,919,788,834], -[7983,7977,834], -[7984,953,787], -[7985,953,788], -[7986,953,787,768], -[7986,7984,768], -[7987,953,788,768], -[7987,7985,768], -[7988,953,787,769], -[7988,7984,769], -[7989,953,788,769], -[7989,7985,769], -[7990,953,787,834], -[7990,7984,834], -[7991,953,788,834], -[7991,7985,834], -[7992,921,787], -[7993,921,788], -[7994,921,787,768], -[7994,7992,768], -[7995,921,788,768], -[7995,7993,768], -[7996,921,787,769], -[7996,7992,769], -[7997,921,788,769], -[7997,7993,769], -[7998,921,787,834], -[7998,7992,834], -[7999,921,788,834], -[7999,7993,834], -[8000,959,787], -[8001,959,788], -[8002,959,787,768], -[8002,8000,768], -[8003,959,788,768], -[8003,8001,768], -[8004,959,787,769], -[8004,8000,769], -[8005,959,788,769], -[8005,8001,769], -[8008,927,787], -[8009,927,788], -[8010,927,787,768], -[8010,8008,768], -[8011,927,788,768], -[8011,8009,768], -[8012,927,787,769], -[8012,8008,769], -[8013,927,788,769], -[8013,8009,769], -[8016,965,787], -[8017,965,788], -[8018,965,787,768], -[8018,8016,768], -[8019,965,788,768], -[8019,8017,768], -[8020,965,787,769], -[8020,8016,769], -[8021,965,788,769], -[8021,8017,769], -[8022,965,787,834], -[8022,8016,834], -[8023,965,788,834], -[8023,8017,834], -[8025,933,788], -[8027,933,788,768], -[8027,8025,768], -[8029,933,788,769], -[8029,8025,769], -[8031,933,788,834], -[8031,8025,834], -[8032,969,787], -[8033,969,788], -[8034,969,787,768], -[8034,8032,768], -[8035,969,788,768], -[8035,8033,768], -[8036,969,787,769], -[8036,8032,769], -[8037,969,788,769], -[8037,8033,769], -[8038,969,787,834], -[8038,8032,834], -[8039,969,788,834], -[8039,8033,834], -[8040,937,787], -[8041,937,788], -[8042,937,787,768], -[8042,8040,768], -[8043,937,788,768], -[8043,8041,768], -[8044,937,787,769], -[8044,8040,769], -[8045,937,788,769], -[8045,8041,769], -[8046,937,787,834], -[8046,8040,834], -[8047,937,788,834], -[8047,8041,834], -[8048,945,768], -[8050,949,768], -[8052,951,768], -[8054,953,768], -[8056,959,768], -[8058,965,768], -[8060,969,768], -[8064,945,787,837], -[8064,8115,787], -[8064,7936,837], -[8065,945,788,837], -[8065,8115,788], -[8065,7937,837], -[8066,945,787,768,837], -[8066,8115,787,768], -[8066,8064,768], -[8066,7936,837,768], -[8066,7936,768,837], -[8066,7938,837], -[8067,945,788,768,837], -[8067,8115,788,768], -[8067,8065,768], -[8067,7937,837,768], -[8067,7937,768,837], -[8067,7939,837], -[8068,945,787,769,837], -[8068,8115,787,769], -[8068,8064,769], -[8068,7936,837,769], -[8068,7936,769,837], -[8068,7940,837], -[8069,945,788,769,837], -[8069,8115,788,769], -[8069,8065,769], -[8069,7937,837,769], -[8069,7937,769,837], -[8069,7941,837], -[8070,945,787,834,837], -[8070,8115,787,834], -[8070,8064,834], -[8070,7936,837,834], -[8070,7936,834,837], -[8070,7942,837], -[8071,945,788,834,837], -[8071,8115,788,834], -[8071,8065,834], -[8071,7937,837,834], -[8071,7937,834,837], -[8071,7943,837], -[8072,913,787,837], -[8072,8124,787], -[8072,7944,837], -[8073,913,788,837], -[8073,8124,788], -[8073,7945,837], -[8074,913,787,768,837], -[8074,8124,787,768], -[8074,8072,768], -[8074,7944,837,768], -[8074,7944,768,837], -[8074,7946,837], -[8075,913,788,768,837], -[8075,8124,788,768], -[8075,8073,768], -[8075,7945,837,768], -[8075,7945,768,837], -[8075,7947,837], -[8076,913,787,769,837], -[8076,8124,787,769], -[8076,8072,769], -[8076,7944,837,769], -[8076,7944,769,837], -[8076,7948,837], -[8077,913,788,769,837], -[8077,8124,788,769], -[8077,8073,769], -[8077,7945,837,769], -[8077,7945,769,837], -[8077,7949,837], -[8078,913,787,834,837], -[8078,8124,787,834], -[8078,8072,834], -[8078,7944,837,834], -[8078,7944,834,837], -[8078,7950,837], -[8079,913,788,834,837], -[8079,8124,788,834], -[8079,8073,834], -[8079,7945,837,834], -[8079,7945,834,837], -[8079,7951,837], -[8080,951,787,837], -[8080,8131,787], -[8080,7968,837], -[8081,951,788,837], -[8081,8131,788], -[8081,7969,837], -[8082,951,787,768,837], -[8082,8131,787,768], -[8082,8080,768], -[8082,7968,837,768], -[8082,7968,768,837], -[8082,7970,837], -[8083,951,788,768,837], -[8083,8131,788,768], -[8083,8081,768], -[8083,7969,837,768], -[8083,7969,768,837], -[8083,7971,837], -[8084,951,787,769,837], -[8084,8131,787,769], -[8084,8080,769], -[8084,7968,837,769], -[8084,7968,769,837], -[8084,7972,837], -[8085,951,788,769,837], -[8085,8131,788,769], -[8085,8081,769], -[8085,7969,837,769], -[8085,7969,769,837], -[8085,7973,837], -[8086,951,787,834,837], -[8086,8131,787,834], -[8086,8080,834], -[8086,7968,837,834], -[8086,7968,834,837], -[8086,7974,837], -[8087,951,788,834,837], -[8087,8131,788,834], -[8087,8081,834], -[8087,7969,837,834], -[8087,7969,834,837], -[8087,7975,837], -[8088,919,787,837], -[8088,8140,787], -[8088,7976,837], -[8089,919,788,837], -[8089,8140,788], -[8089,7977,837], -[8090,919,787,768,837], -[8090,8140,787,768], -[8090,8088,768], -[8090,7976,837,768], -[8090,7976,768,837], -[8090,7978,837], -[8091,919,788,768,837], -[8091,8140,788,768], -[8091,8089,768], -[8091,7977,837,768], -[8091,7977,768,837], -[8091,7979,837], -[8092,919,787,769,837], -[8092,8140,787,769], -[8092,8088,769], -[8092,7976,837,769], -[8092,7976,769,837], -[8092,7980,837], -[8093,919,788,769,837], -[8093,8140,788,769], -[8093,8089,769], -[8093,7977,837,769], -[8093,7977,769,837], -[8093,7981,837], -[8094,919,787,834,837], -[8094,8140,787,834], -[8094,8088,834], -[8094,7976,837,834], -[8094,7976,834,837], -[8094,7982,837], -[8095,919,788,834,837], -[8095,8140,788,834], -[8095,8089,834], -[8095,7977,837,834], -[8095,7977,834,837], -[8095,7983,837], -[8096,969,787,837], -[8096,8179,787], -[8096,8032,837], -[8097,969,788,837], -[8097,8179,788], -[8097,8033,837], -[8098,969,787,768,837], -[8098,8179,787,768], -[8098,8096,768], -[8098,8032,837,768], -[8098,8032,768,837], -[8098,8034,837], -[8099,969,788,768,837], -[8099,8179,788,768], -[8099,8097,768], -[8099,8033,837,768], -[8099,8033,768,837], -[8099,8035,837], -[8100,969,787,769,837], -[8100,8179,787,769], -[8100,8096,769], -[8100,8032,837,769], -[8100,8032,769,837], -[8100,8036,837], -[8101,969,788,769,837], -[8101,8179,788,769], -[8101,8097,769], -[8101,8033,837,769], -[8101,8033,769,837], -[8101,8037,837], -[8102,969,787,834,837], -[8102,8179,787,834], -[8102,8096,834], -[8102,8032,837,834], -[8102,8032,834,837], -[8102,8038,837], -[8103,969,788,834,837], -[8103,8179,788,834], -[8103,8097,834], -[8103,8033,837,834], -[8103,8033,834,837], -[8103,8039,837], -[8104,937,787,837], -[8104,8188,787], -[8104,8040,837], -[8105,937,788,837], -[8105,8188,788], -[8105,8041,837], -[8106,937,787,768,837], -[8106,8188,787,768], -[8106,8104,768], -[8106,8040,837,768], -[8106,8040,768,837], -[8106,8042,837], -[8107,937,788,768,837], -[8107,8188,788,768], -[8107,8105,768], -[8107,8041,837,768], -[8107,8041,768,837], -[8107,8043,837], -[8108,937,787,769,837], -[8108,8188,787,769], -[8108,8104,769], -[8108,8040,837,769], -[8108,8040,769,837], -[8108,8044,837], -[8109,937,788,769,837], -[8109,8188,788,769], -[8109,8105,769], -[8109,8041,837,769], -[8109,8041,769,837], -[8109,8045,837], -[8110,937,787,834,837], -[8110,8188,787,834], -[8110,8104,834], -[8110,8040,837,834], -[8110,8040,834,837], -[8110,8046,837], -[8111,937,788,834,837], -[8111,8188,788,834], -[8111,8105,834], -[8111,8041,837,834], -[8111,8041,834,837], -[8111,8047,837], -[8112,945,774], -[8113,945,772], -[8114,945,768,837], -[8114,8115,768], -[8114,8048,837], -[8115,945,837], -[8116,945,769,837], -[8116,8115,769], -[8116,940,837], -[8118,945,834], -[8119,945,834,837], -[8119,8115,834], -[8119,8118,837], -[8120,913,774], -[8121,913,772], -[8122,913,768], -[8124,913,837], -[8129,168,834], -[8130,951,768,837], -[8130,8131,768], -[8130,8052,837], -[8131,951,837], -[8132,951,769,837], -[8132,8131,769], -[8132,942,837], -[8134,951,834], -[8135,951,834,837], -[8135,8131,834], -[8135,8134,837], -[8136,917,768], -[8138,919,768], -[8140,919,837], -[8141,8127,768], -[8142,8127,769], -[8143,8127,834], -[8144,953,774], -[8145,953,772], -[8146,953,776,768], -[8146,970,768], -[8150,953,834], -[8151,953,776,834], -[8151,970,834], -[8152,921,774], -[8153,921,772], -[8154,921,768], -[8157,8190,768], -[8158,8190,769], -[8159,8190,834], -[8160,965,774], -[8161,965,772], -[8162,965,776,768], -[8162,971,768], -[8164,961,787], -[8165,961,788], -[8166,965,834], -[8167,965,776,834], -[8167,971,834], -[8168,933,774], -[8169,933,772], -[8170,933,768], -[8172,929,788], -[8173,168,768], -[8178,969,768,837], -[8178,8179,768], -[8178,8060,837], -[8179,969,837], -[8180,969,769,837], -[8180,8179,769], -[8180,974,837], -[8182,969,834], -[8183,969,834,837], -[8183,8179,834], -[8183,8182,837], -[8184,927,768], -[8186,937,768], -[8188,937,837], -[8602,8592,824], -[8603,8594,824], -[8622,8596,824], -[8653,8656,824], -[8654,8660,824], -[8655,8658,824], -[8708,8707,824], -[8713,8712,824], -[8716,8715,824], -[8740,8739,824], -[8742,8741,824], -[8769,8764,824], -[8772,8771,824], -[8775,8773,824], -[8777,8776,824], -[8800,61,824], -[8802,8801,824], -[8813,8781,824], -[8814,60,824], -[8815,62,824], -[8816,8804,824], -[8817,8805,824], -[8820,8818,824], -[8821,8819,824], -[8824,8822,824], -[8825,8823,824], -[8832,8826,824], -[8833,8827,824], -[8836,8834,824], -[8837,8835,824], -[8840,8838,824], -[8841,8839,824], -[8876,8866,824], -[8877,8872,824], -[8878,8873,824], -[8879,8875,824], -[8928,8828,824], -[8929,8829,824], -[8930,8849,824], -[8931,8850,824], -[8938,8882,824], -[8939,8883,824], -[8940,8884,824], -[8941,8885,824], -[12364,12363,12441], -[12366,12365,12441], -[12368,12367,12441], -[12370,12369,12441], -[12372,12371,12441], -[12374,12373,12441], -[12376,12375,12441], -[12378,12377,12441], -[12380,12379,12441], -[12382,12381,12441], -[12384,12383,12441], -[12386,12385,12441], -[12389,12388,12441], -[12391,12390,12441], -[12393,12392,12441], -[12400,12399,12441], -[12401,12399,12442], -[12403,12402,12441], -[12404,12402,12442], -[12406,12405,12441], -[12407,12405,12442], -[12409,12408,12441], -[12410,12408,12442], -[12412,12411,12441], -[12413,12411,12442], -[12436,12358,12441], -[12446,12445,12441], -[12460,12459,12441], -[12462,12461,12441], -[12464,12463,12441], -[12466,12465,12441], -[12468,12467,12441], -[12470,12469,12441], -[12472,12471,12441], -[12474,12473,12441], -[12476,12475,12441], -[12478,12477,12441], -[12480,12479,12441], -[12482,12481,12441], -[12485,12484,12441], -[12487,12486,12441], -[12489,12488,12441], -[12496,12495,12441], -[12497,12495,12442], -[12499,12498,12441], -[12500,12498,12442], -[12502,12501,12441], -[12503,12501,12442], -[12505,12504,12441], -[12506,12504,12442], -[12508,12507,12441], -[12509,12507,12442], -[12532,12454,12441], -[12535,12527,12441], -[12536,12528,12441], -[12537,12529,12441], -[12538,12530,12441], -[12542,12541,12441], -); - -1; diff --git a/src/librarian/font-optimizer/Font/Subsetter/create-data.pl b/src/librarian/font-optimizer/Font/Subsetter/create-data.pl deleted file mode 100644 index e0a38fb..0000000 --- a/src/librarian/font-optimizer/Font/Subsetter/create-data.pl +++ /dev/null @@ -1,100 +0,0 @@ -use strict; -use warnings; - -use Unicode::Normalize; - -print <) { - my @c = split /;/, $_; - # Find characters which canonically decompose (without any - # compatibility tag "") - next unless $c[5] and $c[5] !~ /^[ord($1)-ord('a')]/eg; $_ } split / /, $cs2; - # If NFC didn't collapse everything into single characters, this string is not interesting - next if grep length != 1, @x; - # If the string doesn't NFC into the desired character, it's not interesting - next unless Unicode::Normalize::NFC(join '', @x) eq chr hex $c[0]; - # This string is good - push @data, [hex $c[0], map ord, @x]; - } - } - } elsif (@norm == 4) { - my ($a, $b, $c, $d) = @norm; - for my $cs (permut([$a, $b, $c, $d], [])) { - for my $cs2 ('ab c d', 'a bc d', 'a b cd', 'ab cd', 'abc d', 'a bcd') { - my @x = map Unicode::Normalize::NFC($_), map { s/(.)/$cs->[ord($1)-ord('a')]/eg; $_ } split / /, $cs2; - next if grep length != 1, @x; - next unless Unicode::Normalize::NFC(join '', @x) eq chr hex $c[0]; - push @data, [hex $c[0], map ord, @x]; - } - } - } elsif (@norm > 4) { - die "\@norm too big"; - } -} - -print uniq(map "[".join(',', @$_)."],\n", @data); - -print < \$verbose, - 'ttf-to-eot' => \$ttf_to_eot, - 'eot-to-ttf' => \$eot_to_ttf, - ) or help(); - - @ARGV == 2 or help(); - - my ($input_file, $output_file) = @ARGV; - - if ($ttf_to_eot and $eot_to_ttf) { - help(); - } - - if (not ($ttf_to_eot or $eot_to_ttf)) { - if ($input_file =~ /\.[ot]tf$/i and $output_file =~ /\.eot$/i) { - $ttf_to_eot = 1; - } elsif ($input_file =~ /\.eot$/i and $output_file =~ /\.[ot]tf$/i) { - $eot_to_ttf = 1; - } else { - help(); - } - } - - if ($ttf_to_eot) { - Font::EOTWrapper::convert($input_file, $output_file); - } elsif ($eot_to_ttf) { - Font::EOTWrapper::extract($input_file, $output_file); - } -} diff --git a/src/librarian/font-optimizer/ext/Font-TTF/.cvsignore b/src/librarian/font-optimizer/ext/Font-TTF/.cvsignore deleted file mode 100644 index 459bc9c..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -*.gz -MANIFEST diff --git a/src/librarian/font-optimizer/ext/Font-TTF/COPYING b/src/librarian/font-optimizer/ext/Font-TTF/COPYING deleted file mode 100644 index cbda892..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/COPYING +++ /dev/null @@ -1,76 +0,0 @@ - -Artistic License 2.0 - -Copyright (c) 2000-2006, The Perl Foundation. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -Preamble - -This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement. -Definitions - -"Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package. - -"Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures. - -"You" and "your" means any person who would like to copy, distribute, or modify the Package. - -"Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version. - -"Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization. - -"Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees. - -"Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder. - -"Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder. - -"Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future. - -"Source" form means the source code, documentation source, and configuration files for the Package. - -"Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form. -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version. -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License. -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following: - -(a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version. -(b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version. -(c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under -(i) the Original License or -(ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed. -Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version. -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package. -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license. -General Provisions - -(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license. - -(11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license. - -(12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed. - -(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/Changes b/src/librarian/font-optimizer/ext/Font-TTF/Changes deleted file mode 100644 index 1821632..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/Changes +++ /dev/null @@ -1,6 +0,0 @@ -0.45 - -* Introduce changelog -* tidy up 0.44 package, fix README to be more accurate -* tests failing on perl 5.8.2 and before due to no use Exporter qw(import); - Fix OTTags accordingly. diff --git a/src/librarian/font-optimizer/ext/Font-TTF/MANIFEST.SKIP b/src/librarian/font-optimizer/ext/Font-TTF/MANIFEST.SKIP deleted file mode 100644 index 464c50e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/MANIFEST.SKIP +++ /dev/null @@ -1,26 +0,0 @@ -blib/ -\.\$\$\$ -\.tmp -\.bak -CVS/ -\.tar -\.tgz -\.old -misc/ -Build/ -exes/ -\.cvsignore -^# -\.svn/ -Makefile$ -\.par$ --stamp$ -debian/ -pm_to_blib -\~$ -dev/ -build/ -dists/ -^libfont- -description-pak -^doc diff --git a/src/librarian/font-optimizer/ext/Font-TTF/Makefile.PL b/src/librarian/font-optimizer/ext/Font-TTF/Makefile.PL deleted file mode 100644 index c0518d5..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/Makefile.PL +++ /dev/null @@ -1,108 +0,0 @@ -use ExtUtils::MakeMaker; -use Getopt::Std; - -getopts('d:rv:'); - -%pbuilderopts = ( - 'gutsy' => '--bindmounts /media/hosk_1' - ); - -$opt_v ||= 1; - -if ($^O eq 'linux' && !defined $opt_d) -{ - $opt_d = `lsb_release -c`; - $opt_d =~ s/^.*?(\w+)\s*$/$1/o; -} - -@theselibs = (grep {-f } glob("lib/Font/TTF/*"), "lib/Font/TTF.pm"); - -# incantation to enable MY::pm_to_blib later on -if ($^O eq 'MSWin32') -{ - push(@ExtUtils::MakeMaker::Overridable, qw(pm_to_blib)); - @extras = ('dist' => { 'TO_UNIX' => 'perl -Mtounix -e "tounix(\"$(DISTVNAME)\")"' }); -} - -%makeinfo = ( - NAME => 'Font::TTF', - VERSION_FROM => 'lib/Font/TTF.pm', -# VERSION => "0.38", -# HTMLLIBPODS => {map {my $t = $_; $t=~s/\..*?$/.html/o; $t='blib/Html/'.$t; $_ => $t;} @theselibs}, -# HTMLSCRIPTPODS => {map {my $t=$_; $t=~s/\..*?$/.html/o; $t='blib/Html/'.$t; $_ => $t;} @scripts}, - AUTHOR => "martin_hosken\@sil.org", - ABSTRACT => "TTF font support for Perl", - @extras - ); - -WriteMakefile(%makeinfo); - -if ($^O eq 'MSWin32') { -# incantation to solve the problem of everyone's $Config{make} being 'nmake' -# when we want 'pmake'. And $Config{} is read only. -# actually, this is just a copy of the code from ExtUtiles::MM_Win32 tidied -# up (to expose tabs) and the dependency on Config removed -sub MY::pm_to_blib -{ - my $self = shift; - my($autodir) = $self->catdir('$(INST_LIB)','auto'); - return <<"EOT"; - -pm_to_blib: \$(TO_INST_PM) -\t$self->{NOECHO}\$(PERL) \"-I\$(INST_ARCHLINE)\" \"-I\$(INST_LIB)\" \\ -\t\"-I\$(PERL_ARCHLIB)\" \"-I\$(PERL_LIB)\" -MExtUtils::Install \\ -\t-e \"pm_to_blib({ qw[\$(PM_TO_BLIB)] }, '$autodir') -\t$self->{NOECHO}\$(TOUCH) \$@ - -EOT -} - -} -elsif ($^O eq 'linux') -{ - -sub MY::postamble -{ - my ($self) = @_; - my ($res); - my ($package) = lc($self->{'NAME'}); - my ($pversion) = $self->{'VERSION'}; - my ($svn) = `svnversion`; - my ($sign) = '--auto-debsign' if ($opt_r); - my ($fpackage); - - $svn =~ s/[0-9]*://og; - $svn =~ s/\s+$//o; - $package =~ s/::/-/; - $package = "lib${package}-perl"; - $pversion .= "+$svn" unless ($opt_r); - $fpackage = "$package-$pversion"; - - $res = <<"EOT"; -deb-base: dist - rm -fr $self->{'DISTVNAME'} - rm -fr $fpackage - tar xvzf $self->{'DISTVNAME'}.tar.gz - mv $self->{'DISTVNAME'} $fpackage - tar cfz "${package}_$pversion.orig.tar.gz" $fpackage - cp -a debian $fpackage - cd $fpackage && find . -name .svn | xargs rm -rf - -# make deb builds an interim deb from svn source for release -deb: deb-base -EOT - - foreach $d (split(' ', $opt_d)) - { - $res .= <<"EOT"; - mkdir -p dists/$d - dch -D $d -v $pversion-$opt_v -m -b -c $fpackage/debian/changelog "Auto build from perl for $d" - cd $fpackage && pdebuild --buildresult ../dists/$d -- --basetgz /var/cache/pbuilder/base-$d.tgz $pbuilderopts{$d} -EOT - } - - return $res; -} - -} - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/README.TXT b/src/librarian/font-optimizer/ext/Font-TTF/README.TXT deleted file mode 100644 index ad6a602..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/README.TXT +++ /dev/null @@ -1,99 +0,0 @@ - Perl Module: Font::TTF - -=head1 Introduction - -Perl module for TrueType font hacking. Supports reading, processing and -writing of the following tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, -bsln, cmap, cvt, fdsc, feat, fpgm, glyf, hdmx, head, hhea, hmtx, kern, -loca, maxp, mort, name, post, prep, prop, vhea, vmtx and the reading and -writing of all other table types. - -In short, you can do almost anything with a standard TrueType font with -this module. Be Brave! - -Any suggestions, improvements, additions, subclasses, etc. would be gratefully -received and probably included in a future release. Please send them to me. - -This module has been tested on Win32, Unix and Mac. - -Applications that were associated with this module have been moved to Font::TTF::Scripts where great things can be done. - -=head1 SYNOPSIS - -Here is the regression test (you provide your own font). Run it once and then -again on the output of the first run. There should be no differences between -the outputs of the two runs. - - use Font::TTF::Font; - - $f = Font::TTF::Font->open($ARGV[0]); - - # force a read of all the tables - $f->tables_do(sub { $_[0]->read; }); - - # force read of all glyphs (use read_dat to use lots of memory!) - # $f->{'loca'}->glyphs_do(sub { $_[0]->read; }); - $f->{'loca'}->glyphs_do(sub { $_[0]->read_dat; }); - # NB. no need to $g->update since $_[0]->{'glyf'}->out will do it for us - - $f->out($ARGV[1]); - $f->DESTROY; # forces close of $in and maybe memory reclaim! - -=head1 Installation - -If you have received this package as part of an Activestate PPM style .zip file -then type - - ppm install Font-TTF.ppd - -Otherwise. - -To configure this module, cd to the directory that contains this README file -and type the following. - - perl Makefile.PL - -Alternatively, if you plan to install Font::TTF somewhere other than -your system's perl library directory. You can type something like this: - - perl Makefile.PL PREFIX=/home/me/perl INSTALLDIRS=perl - -Then to build you run make. - - make - -If you have write access to the perl library directories, you may then -install by typing: - - make install - -To tidy up, type: - - make realclean - -Win32 users should use pmake instead of make. Alternatively installation can be -done on Win32 by typing: - - Setup - -Or using the install feature in tools like WinZip. - -=head1 CHANGES - -=head2 Future Changes - -I do not anticipate any more restructuring changes (but reserve the right to do so). - -=head1 AUTHOR - -Martin Hosken L - -Copyright Martin Hosken 1998 and following. - -No warranty or expression of effectiveness for anything, least of all anyone's -safety, is implied in this software or documentation. - -=head2 Licensing - -The Perl TTF module is licensed under the Perl Artistic License. - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/TODO b/src/librarian/font-optimizer/ext/Font-TTF/TODO deleted file mode 100644 index a562dc4..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/TODO +++ /dev/null @@ -1,5 +0,0 @@ - -* update() is a mess. What is needed is a mark sweep clean algorithm where the - dirty is used only for tables that have changed. Thus if a table is updated - it could well become dirty! Also need to be able to pass a force parameter - to force a table to update and all the tables in its dependency tree. diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF.pm deleted file mode 100644 index 59237d3..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF.pm +++ /dev/null @@ -1,24 +0,0 @@ -package Font::TTF; - -$VERSION = '0.46'; # MJPH 26-JAN-2009 Various bug fixes, add Sill table -# $VERSION = '0.45'; # MJPH 11-JUN-2008 Packaging tidying -# $VERSION = '0.44'; # MJPH 9-JUN-2008 Various bug fixes -# $VERSION = '0.43'; # MJPH 20-NOV-2007 Add a test! -# $VERSION = '0.42'; # MJPH 11-OCT-2007 Add Volt2ttf support -# $VERSION = '0.41'; # MJPH 27-MAR-2007 Remove warnings from font copy -# Bug fixes in Ttopen, GDEF -# Remove redundant head and maxp ->reads -# $VERSION = '0.40'; # MJPH 31-JUL-2006 Add EBDT, EBLC tables -# $VERSION = 0.39; - -1; - -=head1 NAME - -Font::TTF - Perl module for TrueType Font hacking - -=head1 DESCRIPTION - -This module allows you to do almost anything to a TrueType/OpenType Font -including modify and inspect nearly all tables. - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATKern.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATKern.pm deleted file mode 100644 index 6aa1e62..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATKern.pm +++ /dev/null @@ -1,140 +0,0 @@ -package Font::TTF::AATKern; - -=head1 NAME - -Font::TTF::AATKern - AAT Kern table - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Kern::Subtable; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - - $self->SUPER::read or return $self; - - my ($dat, $fh, $numSubtables); - $fh = $self->{' INFILE'}; - - $fh->read($dat, 8); - ($self->{'version'}, $numSubtables) = TTF_Unpack("vL", $dat); - - my $subtables = []; - foreach (1 .. $numSubtables) { - my $subtableStart = $fh->tell(); - - $fh->read($dat, 8); - my ($length, $coverage, $tupleIndex) = TTF_Unpack("LSS", $dat); - my $type = $coverage & 0x00ff; - - my $subtable = Font::TTF::Kern::Subtable->create($type, $coverage, $length); - $subtable->read($fh); - - $subtable->{'tupleIndex'} = $tupleIndex if $subtable->{'variation'}; - $subtable->{' PARENT'} = $self; - push @$subtables, $subtable; - } - - $self->{'subtables'} = $subtables; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - my $subtables = $self->{'subtables'}; - $fh->print(TTF_Pack("vL", $self->{'version'}, scalar @$subtables)); - - foreach (@$subtables) { - $_->out($fh); - } -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - $self->read unless $self->{' read'}; - - $fh = 'STDOUT' unless defined $fh; - - $fh->printf("version %f\n", $self->{'version'}); - - my $subtables = $self->{'subtables'}; - foreach (@$subtables) { - $_->print($fh); - } -} - -sub dumpXML -{ - my ($self, $fh) = @_; - $self->read unless $self->{' read'}; - - my $post = $self->{' PARENT'}->{'post'}; - $post->read; - - $fh = 'STDOUT' unless defined $fh; - $fh->printf("\n", $self->{'version'}); - - my $subtables = $self->{'subtables'}; - foreach (@$subtables) { - $fh->printf("<%s", $_->type); - $fh->printf(" vertical=\"1\"") if $_->{'vertical'}; - $fh->printf(" crossStream=\"1\"") if $_->{'crossStream'}; - $fh->printf(" variation=\"1\"") if $_->{'variation'}; - $fh->printf(" tupleIndex=\"%s\"", $_->{'tupleIndex'}) if exists $_->{'tupleIndex'}; - $fh->printf(">\n"); - - $_->dumpXML($fh); - - $fh->printf("\n", $_->type); - } - - $fh->printf("\n"); -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATutils.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATutils.pm deleted file mode 100644 index 96ceb7e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/AATutils.pm +++ /dev/null @@ -1,689 +0,0 @@ -package Font::TTF::AATutils; - -use strict; -use vars qw(@ISA @EXPORT); -require Exporter; - -use Font::TTF::Utils; -use IO::File; - -@ISA = qw(Exporter); -@EXPORT = qw( - AAT_read_lookup - AAT_pack_lookup - AAT_write_lookup - AAT_pack_classes - AAT_write_classes - AAT_pack_states - AAT_write_states - AAT_read_state_table - AAT_read_subtable - xmldump -); - -sub xmldump -{ - my ($var, $links, $depth, $processedVars, $type) = @_; - - $processedVars = {} unless (defined $processedVars); - print("\n") if $depth == 0; # not necessarily true encoding for all text! - - my $indent = "\t" x $depth; - - my ($objType, $addr) = ($var =~ m/^.+=(.+)\((.+)\)$/); - unless (defined $type) { - if (defined $addr) { - if (defined $processedVars->{$addr}) { - if ($links) { - printf("%s%s\n", $indent, "$objType"); - } - else { - printf("%s%s\n", $indent, "$objType"); - } - return; - } - $processedVars->{$addr} = 1; - } - } - - $type = ref $var unless defined $type; - - if ($type eq 'REF') { - printf("%s\n", $indent, $$var); - } - elsif ($type eq 'SCALAR') { - printf("%s%s\n", $indent, $var); - } - elsif ($type eq 'ARRAY') { - # printf("%s\n", $indent); - foreach (0 .. $#$var) { - if (ref($var->[$_])) { - printf("%s\n", $indent, $_); - xmldump($var->[$_], $links, $depth + 1, $processedVars); - printf("%s\n", $indent); - } - else { - printf("%s%s\n", $indent, $_, $var->[$_]); - } - } - # printf("%s\n", $indent); - } - elsif ($type eq 'HASH') { - # printf("%s\n", $indent); - foreach (sort keys %$var) { - if (ref($var->{$_})) { - printf("%s\n", $indent, $_); - xmldump($var->{$_}, $links, $depth + 1, $processedVars); - printf("%s\n", $indent); - } - else { - printf("%s%s\n", $indent, $_, $var->{$_}); - } - } - # printf("%s\n", $indent); - } - elsif ($type eq 'CODE') { - printf("%s\n", $indent, $var); - } - elsif ($type eq 'GLOB') { - printf("%s\n", $indent, $var); - } - elsif ($type eq '') { - printf("%s%s\n", $indent, $var); - } - else { - if ($links) { - printf("%s\n", $indent, $type, $addr); - } - else { - printf("%s\n", $indent, $type); - } - xmldump($var, $links, $depth + 1, $processedVars, $objType); - printf("%s\n", $indent); - } -} - -=head2 ($classes, $states) = AAT_read_subtable($fh, $baseOffset, $subtableStart, $limits) - -=cut - -sub AAT_read_subtable -{ - my ($fh, $baseOffset, $subtableStart, $limits) = @_; - - my $limit = 0xffffffff; - foreach (@$limits) { - $limit = $_ if ($_ > $subtableStart and $_ < $limit); - } - die if $limit == 0xffffffff; - - my $dat; - $fh->seek($baseOffset + $subtableStart, IO::File::SEEK_SET); - $fh->read($dat, $limit - $subtableStart); - - $dat; -} - -=head2 $length = AAT_write_state_table($fh, $classes, $states, $numExtraTables, $packEntry) - -$packEntry is a subroutine for packing an entry into binary form, called as - -$dat = $packEntry($entry, $entryTable, $numEntries) - -where the entry is a comma-separated list of nextStateOffset, flags, actions - -=cut - -sub AAT_pack_state_table -{ - my ($classes, $states, $numExtraTables, $packEntry) = @_; - - my ($dat) = pack("n*", (0) x (4 + $numExtraTables)); # placeholders for stateSize, classTable, stateArray, entryTable - - my ($firstGlyph, $lastGlyph) = (0xffff, 0, 0); - my (@classTable, $i); - foreach $i (0 .. $#$classes) { - my $class = $classes->[$i]; - foreach (@$class) { - $firstGlyph = $_ if $_ < $firstGlyph; - $lastGlyph = $_ if $_ > $lastGlyph; - $classTable[$_] = $i; - } - } - - my $classTable = length($dat); - $dat .= pack("nnC*", $firstGlyph, $lastGlyph - $firstGlyph + 1, - map { defined $classTable[$_] ? $classTable[$_] : 1 } ($firstGlyph .. $lastGlyph)); - $dat .= pack("C", 0) if (($lastGlyph - $firstGlyph) & 1) == 0; # pad if odd number of glyphs - - my $stateArray = length($dat); - my (@entries, %entries); - my $state = $states->[0]; - my $stateSize = @$state; - die "stateSize below minimum allowed (4)" if $stateSize < 4; - die "stateSize (" . $stateSize . ") too small for max class number (" . $#$classes . ")" if $stateSize < $#$classes + 1; - warn "state array has unreachable columns" if $stateSize > $#$classes + 1; - - foreach (@$states) { - die "inconsistent state size" if @$_ != $stateSize; - foreach (@$_) { - my $actions = $_->{'actions'}; - my $entry = join(",", $stateArray + $_->{'nextState'} * $stateSize, $_->{'flags'}, ref($actions) eq 'ARRAY' ? @$actions : $actions); - if (not defined $entries{$entry}) { - push @entries, $entry; - $entries{$entry} = $#entries; - die "too many different state array entries" if $#entries == 256; - } - $dat .= pack("C", $entries{$entry}); - } - } - $dat .= pack("C", 0) if (@$states & 1) != 0 and ($stateSize & 1) != 0; # pad if state array size is odd - - my $entryTable = length($dat); - $dat .= map { &$packEntry($_, $entryTable, $#entries + 1) } @entries; - - my ($dat1) = pack("nnnn", $stateSize, $classTable, $stateArray, $entryTable); - substr($dat, 0, length($dat1)) = $dat1; - - return $dat; -} - -sub AAT_write_state_table -{ - my ($fh, $classes, $states, $numExtraTables, $packEntry) = @_; - - my $stateTableStart = $fh->tell(); - - $fh->print(pack("n*", (0) x (4 + $numExtraTables))); # placeholders for stateSize, classTable, stateArray, entryTable - - my ($firstGlyph, $lastGlyph) = (0xffff, 0, 0); - my (@classTable, $i); - foreach $i (0 .. $#$classes) { - my $class = $classes->[$i]; - foreach (@$class) { - $firstGlyph = $_ if $_ < $firstGlyph; - $lastGlyph = $_ if $_ > $lastGlyph; - $classTable[$_] = $i; - } - } - - my $classTable = $fh->tell() - $stateTableStart; - $fh->print(pack("nnC*", $firstGlyph, $lastGlyph - $firstGlyph + 1, - map { defined $classTable[$_] ? $classTable[$_] : 1 } ($firstGlyph .. $lastGlyph))); - $fh->print(pack("C", 0)) if (($lastGlyph - $firstGlyph) & 1) == 0; # pad if odd number of glyphs - - my $stateArray = $fh->tell() - $stateTableStart; - my (@entries, %entries); - my $state = $states->[0]; - my $stateSize = @$state; - die "stateSize below minimum allowed (4)" if $stateSize < 4; - die "stateSize (" . $stateSize . ") too small for max class number (" . $#$classes . ")" if $stateSize < $#$classes + 1; - warn "state array has unreachable columns" if $stateSize > $#$classes + 1; - - foreach (@$states) { - die "inconsistent state size" if @$_ != $stateSize; - foreach (@$_) { - my $actions = $_->{'actions'}; - my $entry = join(",", $stateArray + $_->{'nextState'} * $stateSize, $_->{'flags'}, ref($actions) eq 'ARRAY' ? @$actions : $actions); - if (not defined $entries{$entry}) { - push @entries, $entry; - $entries{$entry} = $#entries; - die "too many different state array entries" if $#entries == 256; - } - $fh->print(pack("C", $entries{$entry})); - } - } - $fh->print(pack("C", 0)) if (@$states & 1) != 0 and ($stateSize & 1) != 0; # pad if state array size is odd - - my $entryTable = $fh->tell() - $stateTableStart; - $fh->print(map { &$packEntry($_, $entryTable, $#entries + 1) } @entries); - - my $length = $fh->tell() - $stateTableStart; - $fh->seek($stateTableStart, IO::File::SEEK_SET); - $fh->print(pack("nnnn", $stateSize, $classTable, $stateArray, $entryTable)); - - $fh->seek($stateTableStart + $length, IO::File::SEEK_SET); - $length; -} - -sub AAT_pack_classes -{ - my ($classes) = @_; - - my ($firstGlyph, $lastGlyph) = (0xffff, 0, 0); - my (@classTable, $i); - foreach $i (0 .. $#$classes) { - my $class = $classes->[$i]; - foreach (@$class) { - $firstGlyph = $_ if $_ < $firstGlyph; - $lastGlyph = $_ if $_ > $lastGlyph; - $classTable[$_] = $i; - } - } - - my ($dat) = pack("nnC*", $firstGlyph, $lastGlyph - $firstGlyph + 1, - map { defined $classTable[$_] ? $classTable[$_] : 1 } ($firstGlyph .. $lastGlyph)); - $dat .= pack("C", 0) if (($lastGlyph - $firstGlyph) & 1) == 0; # pad if odd number of glyphs - - return $dat; -} - -sub AAT_write_classes -{ - my ($fh, $classes) = @_; - - $fh->print(AAT_pack_classes($fh, $classes)); -} - -sub AAT_pack_states -{ - my ($classes, $stateArray, $states, $buildEntryProc) = @_; - - my ($entries, %entryHash); - my $state = $states->[0]; - my $stateSize = @$state; - - die "stateSize below minimum allowed (4)" if $stateSize < 4; - die "stateSize (" . $stateSize . ") too small for max class number (" . $#$classes . ")" if $stateSize < $#$classes + 1; - warn "state array has unreachable columns" if $stateSize > $#$classes + 1; - - my ($dat); - foreach (@$states) { - die "inconsistent state size" if @$_ != $stateSize; - foreach (@$_) { - my $entry = join(",", $stateArray + $_->{'nextState'} * $stateSize, &$buildEntryProc($_)); - if (not defined $entryHash{$entry}) { - push @$entries, $entry; - $entryHash{$entry} = $#$entries; - die "too many different state array entries" if $#$entries == 256; - } - $dat .= pack("C", $entryHash{$entry}); - } - } - $dat .= pack("C", 0) if (@$states & 1) != 0 and ($stateSize & 1) != 0; # pad if state array size is odd - - ($dat, $stateSize, $entries); -} - -sub AAT_write_states -{ - my ($fh, $classes, $stateArray, $states, $buildEntryProc) = @_; - - my ($entries, %entryHash); - my $state = $states->[0]; - my $stateSize = @$state; - - die "stateSize below minimum allowed (4)" if $stateSize < 4; - die "stateSize (" . $stateSize . ") too small for max class number (" . $#$classes . ")" if $stateSize < $#$classes + 1; - warn "state array has unreachable columns" if $stateSize > $#$classes + 1; - - foreach (@$states) { - die "inconsistent state size" if @$_ != $stateSize; - foreach (@$_) { - my $entry = join(",", $stateArray + $_->{'nextState'} * $stateSize, &$buildEntryProc($_)); - if (not defined $entryHash{$entry}) { - push @$entries, $entry; - $entryHash{$entry} = $#$entries; - die "too many different state array entries" if $#$entries == 256; - } - $fh->print(pack("C", $entryHash{$entry})); - } - } - $fh->print(pack("C", 0)) if (@$states & 1) != 0 and ($stateSize & 1) != 0; # pad if state array size is odd - - ($stateSize, $entries); -} - -=head2 ($classes, $states, $entries) = AAT_read_state_table($fh, $numActionWords) - -=cut - -sub AAT_read_state_table -{ - my ($fh, $numActionWords) = @_; - - my $stateTableStart = $fh->tell(); - my $dat; - $fh->read($dat, 8); - my ($stateSize, $classTable, $stateArray, $entryTable) = unpack("nnnn", $dat); - - my $classes; # array of lists of glyphs - - $fh->seek($stateTableStart + $classTable, IO::File::SEEK_SET); - $fh->read($dat, 4); - my ($firstGlyph, $nGlyphs) = unpack("nn", $dat); - $fh->read($dat, $nGlyphs); - foreach (unpack("C*", $dat)) { - if ($_ != 1) { - my $class = $classes->[$_]; - push(@$class, $firstGlyph); - $classes->[$_] = $class unless defined $classes->[$_]; - } - $firstGlyph++; - } - - $fh->seek($stateTableStart + $stateArray, IO::File::SEEK_SET); - my $states; # array of arrays of hashes{nextState, flags, actions} - - my $entrySize = 4 + ($numActionWords * 2); - my $lastState = 1; - my $entries; - while ($#$states < $lastState) { - $fh->read($dat, $stateSize); - my @stateEntries = unpack("C*", $dat); - my $state; - foreach (@stateEntries) { - if (not defined $entries->[$_]) { - my $loc = $fh->tell(); - $fh->seek($stateTableStart + $entryTable + ($_ * $entrySize), IO::File::SEEK_SET); - $fh->read($dat, $entrySize); - my ($nextState, $flags, $actions); - ($nextState, $flags, @$actions) = unpack("n*", $dat); - $nextState -= $stateArray; - $nextState /= $stateSize; - $entries->[$_] = { 'nextState' => $nextState, 'flags' => $flags }; - $entries->[$_]->{'actions'} = $actions if $numActionWords > 0; - $lastState = $nextState if ($nextState > $lastState); - $fh->seek($loc, IO::File::SEEK_SET); - } - push(@$state, $entries->[$_]); - } - push(@$states, $state); - } - - ($classes, $states, $entries); -} - -=head2 ($format, $lookup) = AAT_read_lookup($fh, $valueSize, $length, $default) - -=cut - -sub AAT_read_lookup -{ - my ($fh, $valueSize, $length, $default) = @_; - - my $lookupStart = $fh->tell(); - my ($dat, $unpackChar); - if ($valueSize == 1) { - $unpackChar = "C"; - } - elsif ($valueSize == 2) { - $unpackChar = "n"; - } - elsif ($valueSize == 4) { - $unpackChar = "N"; - } - else { - die "unsupported value size"; - } - - $fh->read($dat, 2); - my $format = unpack("n", $dat); - my $lookup; - - if ($format == 0) { - $fh->read($dat, $length - 2); - my $i = -1; - $lookup = { map { $i++; ($_ != $default) ? ($i, $_) : () } unpack($unpackChar . "*", $dat) }; - } - - elsif ($format == 2) { - $fh->read($dat, 10); - my ($unitSize, $nUnits, $searchRange, $entrySelector, $rangeShift) = unpack("nnnnn", $dat); - die if $unitSize != 4 + $valueSize; - foreach (1 .. $nUnits) { - $fh->read($dat, $unitSize); - my ($lastGlyph, $firstGlyph, $value) = unpack("nn" . $unpackChar, $dat); - if ($firstGlyph != 0xffff and $value != $default) { - foreach ($firstGlyph .. $lastGlyph) { - $lookup->{$_} = $value; - } - } - } - } - - elsif ($format == 4) { - $fh->read($dat, 10); - my ($unitSize, $nUnits, $searchRange, $entrySelector, $rangeShift) = unpack("nnnnn", $dat); - die if $unitSize != 6; - foreach (1 .. $nUnits) { - $fh->read($dat, $unitSize); - my ($lastGlyph, $firstGlyph, $offset) = unpack("nnn", $dat); - if ($firstGlyph != 0xffff) { - my $loc = $fh->tell(); - $fh->seek($lookupStart + $offset, IO::File::SEEK_SET); - $fh->read($dat, ($lastGlyph - $firstGlyph + 1) * $valueSize); - my @values = unpack($unpackChar . "*", $dat); - foreach (0 .. $lastGlyph - $firstGlyph) { - $lookup->{$firstGlyph + $_} = $values[$_] if $values[$_] != $default; - } - $fh->seek($loc, IO::File::SEEK_SET); - } - } - } - - elsif ($format == 6) { - $fh->read($dat, 10); - my ($unitSize, $nUnits, $searchRange, $entrySelector, $rangeShift) = unpack("nnnnn", $dat); - die if $unitSize != 2 + $valueSize; - foreach (1 .. $nUnits) { - $fh->read($dat, $unitSize); - my ($glyph, $value) = unpack("n" . $unpackChar, $dat); - $lookup->{$glyph} = $value if $glyph != 0xffff and $value != $default; - } - } - - elsif ($format == 8) { - $fh->read($dat, 4); - my ($firstGlyph, $glyphCount) = unpack("nn", $dat); - $fh->read($dat, $glyphCount * $valueSize); - $firstGlyph--; - $lookup = { map { $firstGlyph++; $_ != $default ? ($firstGlyph, $_) : () } unpack($unpackChar . "*", $dat) }; - } - - else { - die "unknown lookup format"; - } - - $fh->seek($lookupStart + $length, IO::File::SEEK_SET); - - ($format, $lookup); -} - -=head2 AAT_write_lookup($fh, $format, $lookup, $valueSize, $default) - -=cut - -sub AAT_pack_lookup -{ - my ($format, $lookup, $valueSize, $default) = @_; - - my $packChar; - if ($valueSize == 1) { - $packChar = "C"; - } - elsif ($valueSize == 2) { - $packChar = "n"; - } - elsif ($valueSize == 4) { - $packChar = "N"; - } - else { - die "unsupported value size"; - } - - my ($dat) = pack("n", $format); - - my ($firstGlyph, $lastGlyph) = (0xffff, 0); - foreach (keys %$lookup) { - $firstGlyph = $_ if $_ < $firstGlyph; - $lastGlyph = $_ if $_ > $lastGlyph; - } - my $glyphCount = $lastGlyph - $firstGlyph + 1; - - if ($format == 0) { - $dat .= pack($packChar . "*", map { defined $lookup->{$_} ? $lookup->{$_} : defined $default ? $default : $_ } (0 .. $lastGlyph)); - } - - elsif ($format == 2) { - my $prev = $default; - my $segStart = $firstGlyph; - my $dat1; - foreach ($firstGlyph .. $lastGlyph + 1) { - my $val = $lookup->{$_}; - $val = $default unless defined $val; - if ($val != $prev) { - $dat1 .= pack("nn" . $packChar, $_ - 1, $segStart, $prev) if $prev != $default; - $prev = $val; - $segStart = $_; - } - } - $dat1 .= pack("nn" . $packChar, 0xffff, 0xffff, 0); - my $unitSize = 4 + $valueSize; - $dat .= pack("nnnnn", $unitSize, TTF_bininfo(length($dat1) / $unitSize, $unitSize)); - $dat .= $dat1; - } - - elsif ($format == 4) { - my $segArray = new Font::TTF::Segarr($valueSize); - $segArray->add_segment($firstGlyph, 1, map { $lookup->{$_} } ($firstGlyph .. $lastGlyph)); - my ($start, $end, $offset); - $offset = 12 + @$segArray * 6 + 6; # 12 is size of format word + binSearchHeader; 6 bytes per segment; 6 for terminating segment - my $dat1; - foreach (@$segArray) { - $start = $_->{'START'}; - $end = $start + $_->{'LEN'} - 1; - $dat1 .= pack("nnn", $end, $start, $offset); - $offset += $_->{'LEN'} * 2; - } - $dat1 .= pack("nnn", 0xffff, 0xffff, 0); - $dat .= pack("nnnnn", 6, TTF_bininfo(length($dat1) / 6, 6)); - $dat .= $dat1; - foreach (@$segArray) { - $dat1 = $_->{'VAL'}; - $dat .= pack($packChar . "*", @$dat1); - } - } - - elsif ($format == 6) { - die "unsupported" if $valueSize != 2; - my $dat1 = pack("n*", map { $_, $lookup->{$_} } sort { $a <=> $b } grep { $lookup->{$_} ne $default } keys %$lookup); - my $unitSize = 2 + $valueSize; - $dat .= pack("nnnnn", $unitSize, TTF_bininfo(length($dat1) / $unitSize, $unitSize)); - $dat .= $dat1; - } - - elsif ($format == 8) { - $dat .= pack("nn", $firstGlyph, $lastGlyph - $firstGlyph + 1); - $dat .= pack($packChar . "*", map { defined $lookup->{$_} ? $lookup->{$_} : defined $default ? $default : $_ } ($firstGlyph .. $lastGlyph)); - } - - else { - die "unknown lookup format"; - } - - my $padBytes = (4 - (length($dat) & 3)) & 3; - $dat .= pack("C*", (0) x $padBytes); - - return $dat; -} - -sub AAT_write_lookup -{ - my ($fh, $format, $lookup, $valueSize, $default) = @_; - - my $lookupStart = $fh->tell(); - my $packChar; - if ($valueSize == 1) { - $packChar = "C"; - } - elsif ($valueSize == 2) { - $packChar = "n"; - } - elsif ($valueSize == 4) { - $packChar = "N"; - } - else { - die "unsupported value size"; - } - - $fh->print(pack("n", $format)); - - my ($firstGlyph, $lastGlyph) = (0xffff, 0); - foreach (keys %$lookup) { - $firstGlyph = $_ if $_ < $firstGlyph; - $lastGlyph = $_ if $_ > $lastGlyph; - } - my $glyphCount = $lastGlyph - $firstGlyph + 1; - - if ($format == 0) { - $fh->print(pack($packChar . "*", map { defined $lookup->{$_} ? $lookup->{$_} : defined $default ? $default : $_ } (0 .. $lastGlyph))); - } - - elsif ($format == 2) { - my $prev = $default; - my $segStart = $firstGlyph; - my $dat; - foreach ($firstGlyph .. $lastGlyph + 1) { - my $val = $lookup->{$_}; - $val = $default unless defined $val; - if ($val != $prev) { - $dat .= pack("nn" . $packChar, $_ - 1, $segStart, $prev) if $prev != $default; - $prev = $val; - $segStart = $_; - } - } - $dat .= pack("nn" . $packChar, 0xffff, 0xffff, 0); - my $unitSize = 4 + $valueSize; - $fh->print(pack("nnnnn", $unitSize, TTF_bininfo(length($dat) / $unitSize, $unitSize))); - $fh->print($dat); - } - - elsif ($format == 4) { - my $segArray = new Font::TTF::Segarr($valueSize); - $segArray->add_segment($firstGlyph, 1, map { $lookup->{$_} } ($firstGlyph .. $lastGlyph)); - my ($start, $end, $offset); - $offset = 12 + @$segArray * 6 + 6; # 12 is size of format word + binSearchHeader; 6 bytes per segment; 6 for terminating segment - my $dat; - foreach (@$segArray) { - $start = $_->{'START'}; - $end = $start + $_->{'LEN'} - 1; - $dat .= pack("nnn", $end, $start, $offset); - $offset += $_->{'LEN'} * 2; - } - $dat .= pack("nnn", 0xffff, 0xffff, 0); - $fh->print(pack("nnnnn", 6, TTF_bininfo(length($dat) / 6, 6))); - $fh->print($dat); - foreach (@$segArray) { - $dat = $_->{'VAL'}; - $fh->print(pack($packChar . "*", @$dat)); - } - } - - elsif ($format == 6) { - die "unsupported" if $valueSize != 2; - my $dat = pack("n*", map { $_, $lookup->{$_} } sort { $a <=> $b } grep { $lookup->{$_} ne $default } keys %$lookup); - my $unitSize = 2 + $valueSize; - $fh->print(pack("nnnnn", $unitSize, TTF_bininfo(length($dat) / $unitSize, $unitSize))); - $fh->print($dat); - } - - elsif ($format == 8) { - $fh->print(pack("nn", $firstGlyph, $lastGlyph - $firstGlyph + 1)); - $fh->print(pack($packChar . "*", map { defined $lookup->{$_} ? $lookup->{$_} : defined $default ? $default : $_ } ($firstGlyph .. $lastGlyph))); - } - - else { - die "unknown lookup format"; - } - - my $length = $fh->tell() - $lookupStart; - my $padBytes = (4 - ($length & 3)) & 3; - $fh->print(pack("C*", (0) x $padBytes)); - $length += $padBytes; - - $length; -} - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Anchor.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Anchor.pm deleted file mode 100644 index b901e83..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Anchor.pm +++ /dev/null @@ -1,216 +0,0 @@ -package Font::TTF::Anchor; - -=head1 NAME - -Font::TTF::Anchor - Anchor points for GPOS tables - -=head1 DESCRIPTION - -The Anchor defines an anchor point on a glyph providing various information -depending on how much is available, including such information as the co-ordinates, -a curve point and even device specific modifiers. - -=head1 INSTANCE VARIABLES - -=over 4 - -=item x - -XCoordinate of the anchor point - -=item y - -YCoordinate of the anchor point - -=item p - -Curve point on the glyph to use as the anchor point - -=item xdev - -Device table (delta) for the xcoordinate - -=item ydev - -Device table (delta) for the ycoordinate - -=item xid - -XIdAnchor for multiple master horizontal metric id - -=item yid - -YIdAnchor for multiple master vertical metric id - -=back - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Utils; - - -=head2 new - -Creates a new Anchor - -=cut - -sub new -{ - my ($class) = shift; - my ($self) = {@_}; - - bless $self, $class; -} - - -=head2 read($fh) - -Reads the anchor from the given file handle at that point. The file handle is left -at an arbitrary read point, usually the end of something! - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat, $loc, $fmt, $p, $xoff, $yoff); - - $fh->read($dat, 6); - $fmt = unpack('n', $dat); - if ($fmt == 4) - { ($self->{'xid'}, $self->{'yid'}) = TTF_Unpack('S2', substr($dat,2)); } - else - { ($self->{'x'}, $self->{'y'}) = TTF_Unpack('s2', substr($dat,2)); } - - if ($fmt == 2) - { - $fh->read($dat, 2); - $self->{'p'} = unpack('n', $dat); - } elsif ($fmt == 3) - { - $fh->read($dat, 4); - ($xoff, $yoff) = unpack('n2', $dat); - $loc = $fh->tell() - 10; - if ($xoff) - { - $fh->seek($loc + $xoff, 0); - $self->{'xdev'} = Font::TTF::Delta->new->read($fh); - } - if ($yoff) - { - $fh->seek($loc + $yoff, 0); - $self->{'ydev'} = Font::TTF::Delta->new->read($fh); - } - } - $self; -} - - -=head2 out($fh, $style) - -Outputs the Anchor to the given file handle at this point also addressing issues -of deltas. If $style is set, then no output is sent to the file handle. The return -value is the output string. - -=cut - -sub out -{ - my ($self, $fh, $style) = @_; - my ($xoff, $yoff, $fmt, $out); - - if (defined $self->{'xid'} || defined $self->{'yid'}) - { $out = TTF_Pack('SSS', 4, $self->{'xid'}, $self->{'yid'}); } - elsif (defined $self->{'p'}) - { $out = TTF_Pack('Ssss', 2, @{$self}{'x', 'y', 'p'}); } - elsif (defined $self->{'xdev'} || defined $self->{'ydev'}) - { - $out = TTF_Pack('Sss', 3, @{$self}{'x', 'y'}); - if (defined $self->{'xdev'}) - { - $out .= pack('n2', 10, 0); - $out .= $self->{'xdev'}->out($fh, 1); - $yoff = length($out) - 10; - } - else - { $out .= pack('n2', 0, 0); } - if (defined $self->{'ydev'}) - { - $yoff = 10 unless $yoff; - substr($out, 8, 2) = pack('n', $yoff); - $out .= $self->{'ydev'}->out($fh, 1); - } - } else - { $out = TTF_Pack('Sss', 1, @{$self}{'x', 'y'}); } - $fh->print($out) unless $style; - $out; -} - - -sub signature -{ - my ($self) = @_; - return join (",", map {"${_}=$self->{$_}"} qw(x y p xdev ydev xid yid)); -} - - -=head2 $a->out_xml($context) - -Outputs the anchor in XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - my ($end); - - $fh->print("$depthprint(" p='$self->{'p'}'") if defined ($self->{'p'}); - $end = (defined $self->{'xdev'} || defined $self->{'ydev'} || defined $self->{'xid'} || defined $self->{'yid'}); - unless ($end) - { - $fh->print("/>\n"); - return $self; - } - - if (defined $self->{'xdev'}) - { - $fh->print("$depth$context->{'indent'}\n"); - $self->{'xdev'}->out_xml($context, $depth . ($context->{'indent'} x 2)); - $fh->print("$depth$context->{'indent'}\n"); - } - - if (defined $self->{'ydev'}) - { - $fh->print("$depth$context->{'indent'}\n"); - $self->{'ydev'}->out_xml($context, $depth . ($context->{'indent'} x 2)); - $fh->print("$depth$context->{'indent'}\n"); - } - - if (defined $self->{'xid'} || defined $self->{'yid'}) - { - $fh->print("$depth$context->{'indent'}print(" xid='$self->{'xid'}'") if defined ($self->{'xid'}); - $fh->print(" yid='$self->{'yid'}'") if defined ($self->{'yid'}); - $fh->print("/>\n"); - } - $fh->print("$depth\n"); - $self; -} - - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Bsln.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Bsln.pm deleted file mode 100644 index 281a512..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Bsln.pm +++ /dev/null @@ -1,163 +0,0 @@ -package Font::TTF::Bsln; - -=head1 NAME - -Font::TTF::Bsln - Baseline table in a font - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=item version - -=item xformat - -=item defaultBaseline - -=item deltas - -=item stdGlyph - -=item ctlPoints - -=item lookupFormat - -=item lookup - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); - -use Font::TTF::AATutils; -use Font::TTF::Utils; -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $fh); - - $self->SUPER::read or return $self; - - $fh = $self->{' INFILE'}; - $fh->read($dat, 8); - my ($version, $format, $defaultBaseline) = TTF_Unpack("vSS", $dat); - - if ($format == 0 or $format == 1) { - $fh->read($dat, 64); - $self->{'deltas'} = [TTF_Unpack("s*", $dat)]; - } - elsif ($format == 2 or $format == 3) { - $fh->read($dat, 2); - $self->{'stdGlyph'} = unpack("n", $dat); - $fh->read($dat, 64); - $self->{'ctlPoints'} = unpack("n*", $dat); - } - else { - die "unknown table format"; - } - - if ($format == 1 or $format == 3) { - my $len = $self->{' LENGTH'} - ($fh->tell() - $self->{' OFFSET'}); - my ($lookupFormat, $lookup) = AAT_read_lookup($fh, 2, $len, $defaultBaseline); - $self->{'lookupFormat'} = $lookupFormat; - $self->{'lookup'} = $lookup; - } - - $self->{'version'} = $version; - $self->{'format'} = $format; - $self->{'defaultBaseline'} = $defaultBaseline; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - my $format = $self->{'format'}; - my $defaultBaseline = $self->{'defaultBaseline'}; - $fh->print(TTF_Pack("vSS", $self->{'version'}, $format, $defaultBaseline)); - - AAT_write_lookup($fh, $self->{'lookupFormat'}, $self->{'lookup'}, 2, $defaultBaseline) if ($format == 1 or $format == 3); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - $self->read; - - $fh = 'STDOUT' unless defined $fh; - - my $format = $self->{'format'}; - $fh->printf("version %f\nformat %d\ndefaultBaseline %d\n", $self->{'version'}, $format, $self->{'defaultBaseline'}); - if ($format == 0 or $format == 1) { - $fh->printf("\tdeltas:\n"); - my $deltas = $self->{'deltas'}; - foreach (0 .. 31) { - $fh->printf("\t\t%d: %d%s\n", $_, $deltas->[$_], defined baselineName_($_) ? "\t# " . baselineName_($_) : ""); - } - } - if ($format == 2 or $format == 3) { - $fh->printf("\tstdGlyph = %d\n", $self->{'stdGlyph'}); - my $ctlPoints = $self->{'ctlPoints'}; - foreach (0 .. 31) { - $fh->printf("\t\t%d: %d%s\n", $_, $ctlPoints->[$_], defined baselineName_($_) ? "\t# " . baselineName_($_) : ""); - } - } - if ($format == 1 or $format == 3) { - $fh->printf("lookupFormat %d\n", $self->{'lookupFormat'}); - my $lookup = $self->{'lookup'}; - foreach (sort { $a <=> $b } keys %$lookup) { - $fh->printf("\tglyph %d: %d%s\n", $_, $lookup->{$_}, defined baselineName_($_) ? "\t# " . baselineName_($_) : ""); - } - } -} - -sub baselineName_ -{ - my ($b) = @_; - my @baselines = ( 'Roman', 'Ideographic centered', 'Ideographic low', 'Hanging', 'Math' ); - $baselines[$b]; -} - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Changes b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Changes deleted file mode 100644 index 2382b82..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Changes +++ /dev/null @@ -1,108 +0,0 @@ -Note. The version number implies a release point. Thus changes that go into a -version occur above the version number, not after it. - -* 0.05 -** cmap - debug reverse() - provide scripts as .pl instead of .bat to placate Unix world - rename makefile.pl to Makefile.PL to keep Unix happy - Add ttfremap script - -* 0.06 .. 0.08 - Fixes to get this stuff working in Unix - -* 0.09 - Never released - -* 0.10 -** cmap - Make reverse return the lowest codepoint that matches rather than - the highest -** font - Use IO::File everywhere to allow passing in of psuedo-file objects - rather than file names -** Utils - Debug FDot2.14 conversion - -* 0.11 -** cmap - Don't store empty entries in the cmap - -* 0.12 -Various changes to reduce warnings - -** glyph - Add update_bbox - Do full glyph writes if loca read rather than glyf read - Get glyph update working usefully. Clarify glyf->read - -* 0.13 - -** glyph - Debug update_bbox for compound glyphs - Add empty() to clear to unread state (allows apps to save memory) - -** OS/2 - update update() to account for new cmap structure - -** Post - Correct mu to pi in Postscript name list. The list now follows the - MS convention for good or ill. - -** Table - Add empty() to clear a table to its unread state - -** Scripts -*** psfix - Added. Creates Post table based on cmap information - -*** eurofix - Added bullet hacking and generally backwards, forwards, all - ways mapping. - -*** ttfenc - Now supports the difference between MS post name list and TeXs - -* 0.14 - - Sort out mix up over CVS mess - -* 0.15 - -** Table - read_dat no longer marks table as read - -** Cvt_ - Mark table as read when read - -** Fpgm - Mark table as read when read - -** Prep - Mark table as read when read - -** Font - Add support for Mac sfnt version code ('true') - Be stricter on out @fontlist, only output tables that exist - -* 0.16 - -** Install - add pmake support - -** glyph - tidy up pod - -** kern - tidy up pod - -** name - add utf8 support - -* 0.17 - -** Utils - Debug TTF_bininfo >>= seems to have stopped working! - -* 0.18 - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cmap.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cmap.pm deleted file mode 100644 index bb3d63c..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cmap.pm +++ /dev/null @@ -1,612 +0,0 @@ -package Font::TTF::Cmap; - -=head1 NAME - -Font::TTF::Cmap - Character map table - -=head1 DESCRIPTION - -Looks after the character map. For ease of use, the actual cmap is held in -a hash against codepoint. Thus for a given table: - - $gid = $font->{'cmap'}{'Tables'}[0]{'val'}{$code}; - -Note that C<$code> should be a true value (0x1234) rather than a string representation. - -=head1 INSTANCE VARIABLES - -The instance variables listed here are not preceeded by a space due to their -emulating structural information in the font. - -=over 4 - -=item Num - -Number of subtables in this table - -=item Tables - -An array of subtables ([0..Num-1]) - -=back - -Each subtables also has its own instance variables which are, again, not -preceeded by a space. - -=over 4 - -=item Platform - -The platform number for this subtable - -=item Encoding - -The encoding number for this subtable - -=item Format - -Gives the stored format of this subtable - -=item Ver - -Gives the version (or language) information for this subtable - -=item val - -A hash keyed by the codepoint value (not a string) storing the glyph id - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the cmap into memory. Format 4 subtables read the whole subtable and -fill in the segmented array accordingly. - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $i, $j, $k, $id, @ids, $s); - my ($start, $end, $range, $delta, $form, $len, $num, $ver, $sg); - my ($fh) = $self->{' INFILE'}; - - $self->SUPER::read or return $self; - $fh->read($dat, 4); - $self->{'Num'} = unpack("x2n", $dat); - $self->{'Tables'} = []; - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = {}; - $fh->read($dat, 8); - ($s->{'Platform'}, $s->{'Encoding'}, $s->{'LOC'}) = (unpack("nnN", $dat)); - $s->{'LOC'} += $self->{' OFFSET'}; - push(@{$self->{'Tables'}}, $s); - } - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - $fh->seek($s->{'LOC'}, 0); - $fh->read($dat, 2); - $form = unpack("n", $dat); - - $s->{'Format'} = $form; - if ($form == 0) - { - my $j = 0; - - $fh->read($dat, 4); - ($len, $s->{'Ver'}) = unpack('n2', $dat); - $fh->read($dat, 256); - $s->{'val'} = {map {$j++; ($_ ? ($j - 1, $_) : ())} unpack("C*", $dat)}; - } elsif ($form == 6) - { - my ($start, $ecount); - - $fh->read($dat, 8); - ($len, $s->{'Ver'}, $start, $ecount) = unpack('n4', $dat); - $fh->read($dat, $ecount << 1); - $s->{'val'} = {map {$start++; ($_ ? ($start - 1, $_) : ())} unpack("n*", $dat)}; - } elsif ($form == 2) # Contributed by Huw Rogers - { - $fh->read($dat, 4); - ($len, $s->{'Ver'}) = unpack('n2', $dat); - $fh->read($dat, 512); - my ($j, $k, $l, $m, $n, @subHeaderKeys, @subHeaders, $subHeader); - $n = 1; - for ($j = 0; $j < 256; $j++) { - my $k = unpack('@'.($j<<1).'n', $dat)>>3; - $n = $k + 1 if $k >= $n; - $subHeaders[$subHeaderKeys[$j] = $k] ||= [ ]; - } - $fh->read($dat, $n<<3); # read subHeaders[] - for ($k = 0; $k < $n; $k++) { - $subHeader = $subHeaders[$k]; - $l = $k<<3; - @$subHeader = unpack('@'.$l.'n4', $dat); - $subHeader->[2] = unpack('s', pack('S', $subHeader->[2])) - if $subHeader->[2] & 0x8000; # idDelta - $subHeader->[3] = - ($subHeader->[3] - (($n - $k)<<3) + 6)>>1; # idRangeOffset - } - $fh->read($dat, $len - ($n<<3) - 518); # glyphIndexArray[] - for ($j = 0; $j < 256; $j++) { - $k = $subHeaderKeys[$j]; - $subHeader = $subHeaders[$k]; - unless ($k) { - $l = $j - $subHeader->[0]; - if ($l >= 0 && $l < $subHeader->[1]) { - $m = unpack('@'.(($l + $subHeader->[3])<<1).'n', $dat); - $m += $subHeader->[2] if $m; - $s->{'val'}{$j} = $m; - } - } else { - for ($l = 0; $l < $subHeader->[1]; $l++) { - $m = unpack('@'.(($l + $subHeader->[3])<<1).'n', $dat); - $m += $subHeader->[2] if $m; - $s->{'val'}{($j<<8) + $l + $subHeader->[0]} = $m; - } - } - } - } elsif ($form == 4) - { - $fh->read($dat, 12); - ($len, $s->{'Ver'}, $num) = unpack('n3', $dat); - $num >>= 1; - $fh->read($dat, $len - 14); - for ($j = 0; $j < $num; $j++) - { - $end = unpack("n", substr($dat, $j << 1, 2)); - $start = unpack("n", substr($dat, ($j << 1) + ($num << 1) + 2, 2)); - $delta = unpack("n", substr($dat, ($j << 1) + ($num << 2) + 2, 2)); - $delta -= 65536 if $delta > 32767; - $range = unpack("n", substr($dat, ($j << 1) + $num * 6 + 2, 2)); - for ($k = $start; $k <= $end; $k++) - { - if ($range == 0 || $range == 65535) # support the buggy FOG with its range=65535 for final segment - { $id = $k + $delta; } - else - { $id = unpack("n", substr($dat, ($j << 1) + $num * 6 + - 2 + ($k - $start) * 2 + $range, 2)) + $delta; } - $id -= 65536 if $id >= 65536; - $s->{'val'}{$k} = $id if ($id); - } - } - } elsif ($form == 8 || $form == 12) - { - $fh->read($dat, 10); - ($len, $s->{'Ver'}) = unpack('x2N2', $dat); - if ($form == 8) - { - $fh->read($dat, 8196); - $num = unpack("N", substr($dat, 8192, 4)); # don't need the map - } else - { - $fh->read($dat, 4); - $num = unpack("N", $dat); - } - $fh->read($dat, 12 * $num); - for ($j = 0; $j < $num; $j++) - { - ($start, $end, $sg) = unpack("N3", substr($dat, $j * 12, 12)); - for ($k = $start; $k <= $end; $k++) - { $s->{'val'}{$k} = $sg++; } - } - } elsif ($form == 10) - { - $fh->read($dat, 18); - ($len, $s->{'Ver'}, $start, $num) = unpack('x2N4', $dat); - $fh->read($dat, $num << 1); - for ($j = 0; $j < $num; $j++) - { $s->{'val'}{$start + $j} = unpack("n", substr($dat, $j << 1, 2)); } - } - } - $self; -} - - -=head2 $t->ms_lookup($uni) - -Finds a Unicode table, giving preference to the MS one, and looks up the given -Unicode codepoint in it to find the glyph id. - -=cut - -sub ms_lookup -{ - my ($self, $uni) = @_; - - $self->find_ms || return undef unless (defined $self->{' mstable'}); - return $self->{' mstable'}{'val'}{$uni}; -} - - -=head2 $t->find_ms - -Finds the a Unicode table, giving preference to the Microsoft one, and sets the C instance variable -to it if found. Returns the table it finds. - -=cut -sub find_ms -{ - my ($self) = @_; - my ($i, $s, $alt, $found); - - return $self->{' mstable'} if defined $self->{' mstable'}; - $self->read; - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - if ($s->{'Platform'} == 3) - { - $self->{' mstable'} = $s; - last if ($s->{'Encoding'} == 10); - $found = 1 if ($s->{'Encoding'} == 1); - } elsif ($s->{'Platform'} == 0 || ($s->{'Platform'} == 2 && $s->{'Encoding'} == 1)) - { $alt = $s; } - } - $self->{' mstable'} = $alt if ($alt && !$found); - $self->{' mstable'}; -} - - -=head2 $t->ms_enc - -Returns the encoding of the microsoft table (0 => symbol, etc.). Returns undef if there is -no Microsoft cmap. - -=cut - -sub ms_enc -{ - my ($self) = @_; - my ($s); - - return $self->{' mstable'}{'Encoding'} - if (defined $self->{' mstable'} && $self->{' mstable'}{'Platform'} == 3); - - foreach $s (@{$self->{'Tables'}}) - { - return $s->{'Encoding'} if ($s->{'Platform'} == 3); - } - return undef; -} - - -=head2 $t->out($fh) - -Writes out a cmap table to a filehandle. If it has not been read, then -just copies from input file to output - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($loc, $s, $i, $base_loc, $j, @keys); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - - $self->{'Tables'} = [sort {$a->{'Platform'} <=> $b->{'Platform'} - || $a->{'Encoding'} <=> $b->{'Encoding'} - || $a->{'Ver'} <=> $b->{'Ver'}} @{$self->{'Tables'}}]; - $self->{'Num'} = scalar @{$self->{'Tables'}}; - - $base_loc = $fh->tell(); - $fh->print(pack("n2", 0, $self->{'Num'})); - - for ($i = 0; $i < $self->{'Num'}; $i++) - { $fh->print(pack("nnN", $self->{'Tables'}[$i]{'Platform'}, $self->{'Tables'}[$i]{'Encoding'}, 0)); } - - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - if ($s->{'Format'} < 8) - { @keys = sort {$a <=> $b} grep { $_ <= 0xFFFF} keys %{$s->{'val'}}; } - else - { @keys = sort {$a <=> $b} keys %{$s->{'val'}}; } - $s->{' outloc'} = $fh->tell(); - if ($s->{'Format'} < 8) - { $fh->print(pack("n3", $s->{'Format'}, 0, $s->{'Ver'})); } # come back for length - else - { $fh->print(pack("n2N2", $s->{'Format'}, 0, 0, $s->{'Ver'})); } - - if ($s->{'Format'} == 0) - { - $fh->print(pack("C256", @{$s->{'val'}}{0 .. 255})); - } elsif ($s->{'Format'} == 6) - { - $fh->print(pack("n2", $keys[0], $keys[-1] - $keys[0] + 1)); - $fh->print(pack("n*", @{$s->{'val'}}{$keys[0] .. $keys[-1]})); - } elsif ($s->{'Format'} == 2) # Contributed by Huw Rogers - { - my ($g, $k, $h, $l, $m, $n); - my (@subHeaderKeys, @subHeaders, $subHeader, @glyphIndexArray); - $n = 0; - @subHeaderKeys = (-1) x 256; - for $j (@keys) { - next unless defined($g = $s->{'val'}{$j}); - $h = int($j>>8); - $l = ($j & 0xff); - if (($k = $subHeaderKeys[$h]) < 0) { - $subHeader = [ $l, 1, 0, 0, [ $g ] ]; - $subHeaders[$k = $n++] = $subHeader; - $subHeaderKeys[$h] = $k; - } else { - $subHeader = $subHeaders[$k]; - $m = ($l - $subHeader->[0] + 1) - $subHeader->[1]; - $subHeader->[1] += $m; - push @{$subHeader->[4]}, (0) x ($m - 1), $g - $subHeader->[2]; - } - } - @subHeaderKeys = map { $_ < 0 ? 0 : $_ } @subHeaderKeys; - $subHeader = $subHeaders[0]; - $subHeader->[3] = 0; - push @glyphIndexArray, @{$subHeader->[4]}; - splice(@$subHeader, 4); - { - my @subHeaders_ = sort {@{$a->[4]} <=> @{$b->[4]}} @subHeaders[1..$#subHeaders]; - my ($f, $d, $r, $subHeader_); - for ($k = 0; $k < @subHeaders_; $k++) { - $subHeader = $subHeaders_[$k]; - $f = $r = shift @{$subHeader->[4]}; - $subHeader->[5] = join(':', - map { - $d = $_ - $r; - $r = $_; - $d < 0 ? - sprintf('-%04x', -$d) : - sprintf('+%04x', $d) - } @{$subHeader->[4]}); - unshift @{$subHeader->[4]}, $f; - } - for ($k = 0; $k < @subHeaders_; $k++) { - $subHeader = $subHeaders_[$k]; - next unless $subHeader->[4]; - $subHeader->[3] = @glyphIndexArray; - push @glyphIndexArray, @{$subHeader->[4]}; - for ($l = $k + 1; $l < @subHeaders_; $l++) { - $subHeader_ = $subHeaders_[$l]; - next unless $subHeader_->[4]; - $d = $subHeader_->[5]; - if ($subHeader->[5] =~ /\Q$d\E/) { - my $o = length($`)/6; #` - $subHeader_->[2] += - $subHeader_->[4]->[$o] - $subHeader->[4]->[0]; - $subHeader_->[3] = $subHeader->[3] + $o; - splice(@$subHeader_, 4); - } - } - splice(@$subHeader, 4); - } - } - $fh->print(pack('n*', map { $_<<3 } @subHeaderKeys)); - for ($j = 0; $j < 256; $j++) { - $k = $subHeaderKeys[$j]; - $subHeader = $subHeaders[$k]; - } - for ($k = 0; $k < $n; $k++) { - $subHeader = $subHeaders[$k]; - $fh->print(pack('n4', - $subHeader->[0], - $subHeader->[1], - $subHeader->[2] < 0 ? - unpack('S', pack('s', $subHeader->[2])) : - $subHeader->[2], - ($subHeader->[3]<<1) + (($n - $k)<<3) - 6 - )); - } - $fh->print(pack('n*', @glyphIndexArray)); - } elsif ($s->{'Format'} == 4) - { - my ($num, $sRange, $eSel, $eShift, @starts, @ends, $doff); - my (@deltas, $delta, @range, $flat, $k, $segs, $count, $newseg, $v); - - push(@keys, 0xFFFF) unless ($keys[-1] == 0xFFFF); - $newseg = 1; $num = 0; - for ($j = 0; $j <= $#keys && $keys[$j] <= 0xFFFF; $j++) - { - $v = $s->{'val'}{$keys[$j]} || 0; - if ($newseg) - { - $delta = $v; - $doff = $j; - $flat = 1; - push(@starts, $keys[$j]); - $newseg = 0; - } - $delta = 0 if ($delta + $j - $doff != $v); - $flat = 0 if ($v == 0); - if ($j == $#keys || $keys[$j] + 1 != $keys[$j+1]) - { - push (@ends, $keys[$j]); - push (@deltas, $delta ? $delta - $keys[$doff] : 0); - push (@range, $flat); - $num++; - $newseg = 1; - } - } - - ($num, $sRange, $eSel, $eShift) = Font::TTF::Utils::TTF_bininfo($num, 2); - $fh->print(pack("n4", $num * 2, $sRange, $eSel, $eShift)); - $fh->print(pack("n*", @ends)); - $fh->print(pack("n", 0)); - $fh->print(pack("n*", @starts)); - $fh->print(pack("n*", @deltas)); - - $count = 0; - for ($j = 0; $j < $num; $j++) - { - $delta = $deltas[$j]; - if ($delta != 0 && $range[$j] == 1) - { $range[$j] = 0; } - else - { - $range[$j] = ($count + $num - $j) << 1; - $count += $ends[$j] - $starts[$j] + 1; - } - } - - $fh->print(pack("n*", @range)); - - for ($j = 0; $j < $num; $j++) - { - next if ($range[$j] == 0); - $fh->print(pack("n*", map {$_ || 0} @{$s->{'val'}}{$starts[$j] .. $ends[$j]})); - } - } elsif ($s->{'Format'} == 8 || $s->{'Format'} == 12) - { - my (@jobs, $start, $current, $curr_glyf, $map); - - $current = 0; $curr_glyf = 0; - $map = "\000" x 8192; - foreach $j (@keys) - { - if ($j > 0xFFFF) - { - if (defined $s->{'val'}{$j >> 16}) - { $s->{'Format'} = 12; } - vec($map, $j >> 16, 1) = 1; - } - if ($j != $current + 1 || $s->{'val'}{$j} != $curr_glyf + 1) - { - push (@jobs, [$start, $current, $curr_glyf - ($current - $start)]) if (defined $start); - $start = $j; $current = $j; $curr_glyf = $s->{'val'}{$j}; - } - $current = $j; - $curr_glyf = $s->{'val'}{$j}; - } - push (@jobs, [$start, $current, $curr_glyf - ($current - $start)]) if (defined $start); - $fh->print($map) if ($s->{'Format'} == 8); - $fh->print(pack('N', $#jobs + 1)); - foreach $j (@jobs) - { $fh->print(pack('N3', @{$j})); } - } elsif ($s->{'Format'} == 10) - { - $fh->print(pack('N2', $keys[0], $keys[-1] - $keys[0] + 1)); - $fh->print(pack('n*', $s->{'val'}{$keys[0] .. $keys[-1]})); - } - - $loc = $fh->tell(); - if ($s->{'Format'} < 8) - { - $fh->seek($s->{' outloc'} + 2, 0); - $fh->print(pack("n", $loc - $s->{' outloc'})); - } else - { - $fh->seek($s->{' outloc'} + 4, 0); - $fh->print(pack("N", $loc - $s->{' outloc'})); - } - $fh->seek($base_loc + 8 + ($i << 3), 0); - $fh->print(pack("N", $s->{' outloc'} - $base_loc)); - $fh->seek($loc, 0); - } - $self; -} - - -=head2 $t->XML_element($context, $depth, $name, $val) - -Outputs the elements of the cmap in XML. We only need to process val here - -=cut - -sub XML_element -{ - my ($self, $context, $depth, $k, $val) = @_; - my ($fh) = $context->{'fh'}; - my ($i); - - return $self if ($k eq 'LOC'); - return $self->SUPER::XML_element($context, $depth, $k, $val) unless ($k eq 'val'); - - $fh->print("$depth\n"); - foreach $i (sort {$a <=> $b} keys %{$val}) - { $fh->printf("%s\n", $depth . $context->{'indent'}, $i, $val->{$i}); } - $fh->print("$depth\n"); - $self; -} - -=head2 @map = $t->reverse(%opt) - -Returns a reverse map of the Unicode cmap. I.e. given a glyph gives the Unicode value for it. Options are: - -=over 4 - -=item tnum - -Table number to use rather than the default Unicode table - -=item array - -Returns each element of reverse as an array since a glyph may be mapped by more -than one Unicode value. The arrays are unsorted. Otherwise store any one unicode value for a glyph. - -=back - -=cut - -sub reverse -{ - my ($self, %opt) = @_; - my ($table) = defined $opt{'tnum'} ? $self->{'Tables'}[$opt{'tnum'}] : $self->find_ms; - my (@res, $code, $gid); - - while (($code, $gid) = each(%{$table->{'val'}})) - { - if ($opt{'array'}) - { push (@{$res[$gid]}, $code); } - else - { $res[$gid] = $code unless (defined $res[$gid] && $res[$gid] > 0 && $res[$gid] < $code); } - } - @res; -} - - -=head2 is_unicode($index) - -Returns whether the table of a given index is known to be a unicode table -(as specified in the specifications) - -=cut - -sub is_unicode -{ - my ($self, $index) = @_; - my ($pid, $eid) = ($self->{'Tables'}[$index]{'Platform'}, $self->{'Tables'}[$index]{'Encoding'}); - - return ($pid == 3 || $pid == 0 || ($pid == 2 && $eid == 1)); -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -No support for format 2 tables (MBCS) - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Coverage.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Coverage.pm deleted file mode 100644 index 909f910..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Coverage.pm +++ /dev/null @@ -1,323 +0,0 @@ -package Font::TTF::Coverage; - -=head1 NAME - -Font::TTF::Coverage - Opentype coverage and class definition objects - -=head1 DESCRIPTION - -Coverage tables and class definition objects are virtually identical concepts -in OpenType. Their difference comes purely in their storage. Therefore we can -say that a coverage table is a class definition in which the class definition -for each glyph is the corresponding index in the coverage table. The resulting -data structure is that a Coverage table has the following fields: - -=item cover - -A boolean to indicate whether this table is a coverage table (TRUE) or a -class definition (FALSE) - -=item val - -A hash of glyph ids against values (either coverage index or class value) - -=item fmt - -The storage format used is given here, but is recalculated when the table -is written out. - -=item count - -A count of the elements in a coverage table for use with add. Each subsequent -addition is added with the current count and increments the count. - -=head1 METHODS - -=cut - -=head2 new($isCover [, vals]) - -Creates a new coverage table or class definition table, depending upon the -value of $isCover. if $isCover then vals may be a list of glyphs to include in order. -If no $isCover, then vals is a hash of glyphs against class values. - -=cut - -sub new -{ - my ($class) = shift; - my ($isCover) = shift; - my ($self) = {}; - - $self->{'cover'} = $isCover; - $self->{'count'} = 0; - if ($isCover) - { - my ($v); - foreach $v (@_) - { $self->{'val'}{$v} = $self->{'count'}++; } - } - else - { - $self->{'val'} = {@_}; - foreach (values %{$self->{'val'}}) {$self->{'max'} = $_ if $_ > $self->{'max'}} - } - bless $self, $class; -} - - -=head2 read($fh) - -Reads the coverage/class table from the given file handle - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat, $fmt, $num, $i, $c); - - $fh->read($dat, 4); - ($fmt, $num) = unpack("n2", $dat); - $self->{'fmt'} = $fmt; - - if ($self->{'cover'}) - { - if ($fmt == 1) - { - $fh->read($dat, $num << 1); - map {$self->{'val'}{$_} = $i++} unpack("n*", $dat); - } elsif ($fmt == 2) - { - $fh->read($dat, $num * 6); - for ($i = 0; $i < $num; $i++) - { - ($first, $last, $c) = unpack("n3", substr($dat, $i * 6, 6)); - map {$self->{'val'}{$_} = $c++} ($first .. $last); - } - } - $self->{'count'} = $num; - } elsif ($fmt == 1) - { - $fh->read($dat, 2); - $first = $num; - ($num) = unpack("n", $dat); - $fh->read($dat, $num << 1); - map {$self->{'val'}{$first++} = $_; $self->{'max'} = $_ if ($_ > $self->{'max'})} unpack("n*", $dat); - } elsif ($fmt == 2) - { - $fh->read($dat, $num * 6); - for ($i = 0; $i < $num; $i++) - { - ($first, $last, $c) = unpack("n3", substr($dat, $i * 6, 6)); - map {$self->{'val'}{$_} = $c} ($first .. $last); - $self->{'max'} = $c if ($c > $self->{'max'}); - } - } - $self; -} - - -=head2 out($fh, $state) - -Writes the coverage/class table to the given file handle. If $state is 1 then -the output string is returned rather than being output to a filehandle. - -=cut - -sub out -{ - my ($self, $fh, $state) = @_; - my ($g, $eff, $grp, $out); - my ($shipout) = ($state ? sub {$out .= $_[0];} : sub {$fh->print($_[0]);}); - my (@gids) = sort {$a <=> $b} keys %{$self->{'val'}}; - - $fmt = 1; $grp = 1; $eff = 0; - for ($i = 1; $i <= $#gids; $i++) - { - if ($self->{'val'}{$gids[$i]} < $self->{'val'}{$gids[$i-1]} && $self->{'cover'}) - { - $fmt = 2; - last; - } elsif ($gids[$i] == $gids[$i-1] + 1 && ($self->{'cover'} || $self->{'val'}{$gids[$i]} == $self->{'val'}{$gids[$i-1]})) - { $eff++; } - else - { - $grp++; - $eff += $gids[$i] - $gids[$i-1] if (!$self->{'cover'}); - } - } -# if ($self->{'cover'}) - { $fmt = 2 if ($eff / $grp > 3); } -# else -# { $fmt = 2 if ($grp > 1); } - - if ($fmt == 1 && $self->{'cover'}) - { - my ($last) = 0; - &$shipout(pack('n2', 1, scalar @gids)); - &$shipout(pack('n*', @gids)); - } elsif ($fmt == 1) - { - my ($last) = $gids[0]; - &$shipout(pack("n3", 1, $last, $gids[-1] - $last + 1)); - foreach $g (@gids) - { - if ($g > $last + 1) - { &$shipout(pack('n*', (0) x ($g - $last - 1))); } - &$shipout(pack('n', $self->{'val'}{$g})); - $last = $g; - } - } else - { - my ($start, $end, $ind, $numloc, $endloc, $num); - &$shipout(pack("n2", 2, 0)); - $numloc = $fh->tell() - 2 unless $state; - - $start = 0; $end = 0; $num = 0; - while ($end < $#gids) - { - if ($gids[$end + 1] == $gids[$end] + 1 - && $self->{'val'}{$gids[$end + 1]} - == $self->{'val'}{$gids[$end]} - + ($self->{'cover'} ? 1 : 0)) - { - $end++; - next; - } - - &$shipout(pack("n3", $gids[$start], $gids[$end], - $self->{'val'}{$gids[$start]})); - $start = $end + 1; - $end++; - $num++; - } - &$shipout(pack("n3", $gids[$start], $gids[$end], - $self->{'val'}{$gids[$start]})); - $num++; - if ($state) - { substr($out, 2, 2) = pack('n', $num); } - else - { - $endloc = $fh->tell(); - $fh->seek($numloc, 0); - $fh->print(pack("n", $num)); - $fh->seek($endloc, 0); - } - } - return ($state ? $out : $self); -} - - -=head2 $c->add($glyphid[, $class]) - -Adds a glyph id to the coverage table incrementing the count so that each subsequent addition -has the next sequential number. Returns the index number of the glyphid added - -=cut - -sub add -{ - my ($self, $gid, $class) = @_; - - return $self->{'val'}{$gid} if (defined $self->{'val'}{$gid}); - if ($self->{'cover'}) - { - $self->{'val'}{$gid} = $self->{'count'}; - return $self->{'count'}++; - } - else - { - $self->{'val'}{$gid} = $class || '0'; - $self->{'max'} = $class if ($class > $self->{'max'}); - return $class; - } -} - - -=head2 $c->signature - -Returns a vector of all the glyph ids covered by this coverage table or class - -=cut - -sub signature -{ - my ($self) = @_; - my ($vec, $range, $size); - -if (0) -{ - if ($self->{'cover'}) - { $range = 1; $size = 1; } - else - { - $range = $self->{'max'}; - $size = 1; - while ($range > 1) - { - $size = $size << 1; - $range = $range >> 1; - } - $range = $self->{'max'} + 1; - } - foreach (keys %{$self->{'val'}}) - { vec($vec, $_, $size) = $self->{'val'}{$_} > $range ? $range : $self->{'val'}{$_}; } - length($vec) . ":" . $vec; -} - $vec = join(";", map{"$_,$self->{'val'}{$_}"} keys %{$self->{'val'}}); -} - -=head2 @map=$c->sort - -Sorts the coverage table so that indexes are in ascending order of glyphid. -Returns a map such that $map[$new_index]=$old_index. - -=cut - -sub sort -{ - my ($self) = @_; - my (@res, $i); - - foreach (sort {$a <=> $b} keys %{$self->{'val'}}) - { - push(@res, $self->{'val'}{$_}); - $self->{'val'}{$_} = $i++; - } - @res; -} - -=head2 $c->out_xml($context) - -Outputs this coverage/class in XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - - $fh->print("$depth<" . ($self->{'cover'} ? 'coverage' : 'class') . ">\n"); - foreach $gid (sort {$a <=> $b} keys %{$self->{'val'}}) - { - $fh->printf("$depth$context->{'indent'}\n", $gid, $self->{'val'}{$gid}); - } - $fh->print("$depth{'cover'} ? 'coverage' : 'class') . ">\n"); - $self; -} - -sub release -{ } - - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cvt_.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cvt_.pm deleted file mode 100644 index 2a79f5b..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Cvt_.pm +++ /dev/null @@ -1,81 +0,0 @@ -package Font::TTF::Cvt_; - -=head1 NAME - -Font::TTF::Cvt_ - Control Value Table in a TrueType font - -=head1 DESCRIPTION - -This is a minimal class adding nothing beyond a table, but is a repository -for cvt type information for those processes brave enough to address hinting. - -=head1 INSTANCE VARIABLES - -=over 4 - -=item val - -This is an array of CVT values. Thus access to the CVT is via: - - $f->{'cvt_'}{'val'}[$num]; - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA $VERSION); -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); - -$VERSION = 0.0001; - -=head2 $t->read - -Reads the CVT table into both the tables C<' dat'> variable and the C -array. - -=cut - -sub read -{ - my ($self) = @_; - - $self->read_dat || return undef; - $self->{' read'} = 1; - $self->{'val'} = [TTF_Unpack("s*", $self->{' dat'})]; - $self; -} - - -=head2 $t->update - -Updates the RAM file copy C<' dat'> to be the same as the array. - -=cut - -sub update -{ - my ($self) = @_; - - return undef unless ($self->{' read'} && $#{$self->{'val'}} >= 0); - $self->{' dat'} = TTF_Pack("s*", @{$self->{'val'}}); - $self; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Delta.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Delta.pm deleted file mode 100644 index 7d63757..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Delta.pm +++ /dev/null @@ -1,173 +0,0 @@ -package Font::TTF::Delta; - -=head1 NAME - -Font::TTF::Delta - Opentype Device tables - -=head1 DESCRIPTION - -Each device table corresponds to a set of deltas for a particular point over -a range of ppem values. - -=item first - -The first ppem value in the range - -=item last - -The last ppem value in the range - -=item val - -This is an array of deltas corresponding to each ppem in the range between -first and last inclusive. - -=item fmt - -This is the fmt used (log2 of number bits per value) when the device table was -read. It is recalculated on output. - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Utils; - -=head2 new - -Creates a new device table - -=cut - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - bless $self, $class; -} - - -=head2 read - -Reads a device table from the given IO object at the current location - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat, $fmt, $num, $i, $j, $mask); - - $fh->read($dat, 6); - ($self->{'first'}, $self->{'last'}, $fmt) = TTF_Unpack("S3", $dat); - $self->{'fmt'} = $fmt; - - $fmt = 1 << $fmt; - $num = ((($self->{'last'} - $self->{'first'} + 1) * $fmt) + 15) >> 8; - $fh->read($dat, $num); - - $mask = (0xffff << (16 - $fmt)) & 0xffff; - $j = 0; - for ($i = $self->{'first'}; $i <= $self->{'last'}; $i++) - { - if ($j == 0) - { - $num = TTF_Unpack("S", substr($dat, 0, 2)); - substr($dat, 0, 2) = ''; - } - push (@{$self->{'val'}}, ($num & $mask) >> (16 - $fmt)); - $num <<= $fmt; - $j += $fmt; - $j = 0 if ($j >= 16); - } - $self; -} - - -=head2 out($fh, $style) - -Outputs a device table to the given IO object at the current location, or just -returns the data to be output if $style != 0 - -=cut - -sub out -{ - my ($self, $fh, $style) = @_; - my ($dat, $fmt, $num, $mask, $j, $f, $out); - - foreach $f (@{$self->{'val'}}) - { - my ($tfmt) = $f > 0 ? $f + 1 : -$f; - $fmt = $tfmt if $tfmt > $fmt; - } - - if ($fmt > 8) - { $fmt = 3; } - elsif ($fmt > 2) - { $fmt = 2; } - else - { $fmt = 1; } - - $out = TTF_Pack("S3", $self->{'first'}, $self->{'last'}, $fmt); - - $fmt = 1 << $fmt; - $mask = 0xffff >> (16 - $fmt); - $j = 0; $dat = 0; - foreach $f (@{$self->{'val'}}) - { - $dat |= ($f & $mask) << (16 - $fmt - $j); - $j += $fmt; - if ($j >= 16) - { - $j = 0; - $out .= TTF_Pack("S", $dat); - $dat = 0; - } - } - $out .= pack('n', $dat) if ($j > 0); - $fh->print($out) unless $style; - $out; -} - -=head2 $d->signature() - -Returns a content based identifying string for this delta for -compression purposes - -=cut - -sub signature -{ - my ($self) = @_; - return join (",", $self->{'first'}, $self->{'last'}, @{$self->{'val'}}); -} - - -=head2 $d->out_xml($context) - -Outputs a delta in XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - - $fh->printf("%s\n", $depth, $self->{'first'}, $self->{'last'}); - $fh->print("$depth$context->{'indent'}" . join (' ', @{$self->{'val'}}) . "\n") if defined ($self->{'val'}); - $fh->print("$depth\n"); -} - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Dumper.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Dumper.pm deleted file mode 100644 index 7cc8699..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Dumper.pm +++ /dev/null @@ -1,79 +0,0 @@ -package Font::TTF::Dumper; - -=head1 NAME - -Font::TTF::Dumper - Debug dump of a font datastructure, avoiding recursion on ' PARENT' - -=head1 SYNOPSIS - - Font::TTF::Dumper; - - # Print a table from the font structure: - print ttfdump($font->{$tag}); - - # Print font table with name - print ttfdump($font->{'head'}, 'head'); - - # Print one glyph's data: - print ttfdump($font->{'loca'}->read->{'glyphs'}[$gid], "glyph_$gid"); - -=head1 DESCRIPTION - -Font::TTF data structures are trees created from hashes and arrays. When trying to figure -out how the structures work, sometimes it is helpful to use Data::Dumper on them. However, -many of the object structures have ' PARENT' links that refer back to the object's parent, -which means that Data::Dumper ends up dumping the whole font no matter what. - -The purpose of this module is to do just one thing: invoke Data::Dumper with a -filter that skips over the ' PARENT' element of any hash. - -To reduce output further, this module also skips over ' CACHE' elements and any -hash element whose value is a Font::TTF::Glyph or Font::TTF::Font object. -(Really should make this configurable.) - -=cut - -use strict; -use Data::Dumper; - -use vars qw(@EXPORT @ISA); -require Exporter; -@ISA = qw( Exporter ); -@EXPORT = qw( ttfdump ); - -my %skip = ( Font => 1, Glyph => 1 ); - -sub ttfdump -{ - my ($var, $name) = @_; - my $res; - - my $d = Data::Dumper->new([$var]); - $d->Names([$name]) if defined $name; - $d->Sortkeys(\&myfilter); # This is the trick to keep from dumping the whole font - $d->Indent(3); # I want array indicies - $d->Useqq(1); # Perlquote -- slower but there might be binary data. - $res = $d->Dump; - $d->DESTROY; - $res; -} - -sub myfilter -{ - my ($hash) = @_; - my @a = grep { - ($_ eq ' PARENT' || $_ eq ' CACHE') ? 0 : - ref($hash->{$_}) =~ m/^Font::TTF::(.*)$/ ? !$skip{$1} : - 1 - } (keys %{$hash}) ; - # Sort numerically if that is reasonable: - return [ sort {$a =~ /\D/ || $b =~ /\D/ ? $a cmp $b : $a <=> $b} @a ]; -} - -1; - -=head1 See also - -L - -=cut diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBDT.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBDT.pm deleted file mode 100644 index 257e8d7..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBDT.pm +++ /dev/null @@ -1,285 +0,0 @@ -package Font::TTF::EBDT; - -=head1 NAME - -Font::TTF::EBDT - Embeeded Bitmap Data Table - -=head1 DESCRIPTION - -Contains the metrics and bitmap image data. - -=head1 INSTANCE VARIABLES - -Only has 'bitmap' instance variable. It is an array of assosiative -array keyed by glyph-id. The element is an object which consists -of metric information and image data. - -=over 4 - -=item bitmap object - -=over 8 -=item format -Only 7 is supported. -=item height -=item width -=item horiBearingX -=item horiBearingY -=item horiAdvance -=item vertBearingX -=item vertBearingY -=item vertAdvance -=item imageData - -=back - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the embedded bitmap data from the TTF file into memory. -This routine should be called _after_ {'EBLC'}->read. - -=cut - -sub read -{ - my ($self) = shift; - my ($fh) = $self->{' INFILE'}; - my ($i, $dat); - my ($eblc) = $self->{' PARENT'}->{'EBLC'}; - my ($bst_array); - - $eblc->read; - $self->SUPER::read || return $self; - - # ebdtHeader - $fh->read($dat, 4); # version - - $bst_array = $eblc->{'bitmapSizeTable'}; - - for ($i = 0; $i < $eblc->{'Num'}; $i++) - { - my ($bst) = $bst_array->[$i]; - my ($format) = $bst->{'imageFormat'}; - my ($offset) = $bst->{'imageDataOffset'}; - my ($j); - my ($ist_array) = $eblc->{'indexSubTableArray'}[$i]; - my ($bitmap) = {}; - - die "Only EBDT format 7 is implemented." unless ($format == 7); - - $self->{'bitmap'}[$i] = $bitmap; - - for ($j = 0; $j < $bst->{'numberOfIndexSubTables'}; $j++) { - my ($ista) = $ist_array->[$j]; - my ($offsetArray) = $eblc->{'indexSubTable'}[$i][$j]; - my ($p, $o0, $c); - -# if ($fh->tell != $self->{' OFFSET'} + $offset) { -# $fh->seek($self->{' OFFSET'} + $offset, 0); -# } - - $p = 0; - $o0 = $offsetArray->[$p++]; - for ($c = $ista->{'firstGlyphIndex'}; $c <= $ista->{'lastGlyphIndex'}; $c++) - { - my ($b) = {}; - my ($o1) = $offsetArray->[$p++]; - my ($len) = $o1 - $o0 - 8; - -# if ($fh->tell != $self->{' OFFSET'} + $offset + $o0) { -# $fh->seek($self->{' OFFSET'} + $offset + $o0, 0); -# } - - $fh->read($dat, 8); - ($b->{'height'}, - $b->{'width'}, - $b->{'horiBearingX'}, - $b->{'horiBearingY'}, - $b->{'horiAdvance'}, - $b->{'vertBearingX'}, - $b->{'vertBearingY'}, - $b->{'vertAdvance'}) - = unpack("cccccccc", $dat); - - $fh->read($dat, $len); - $b->{'imageData'} = $dat; - $b->{'format'} = 7; # bitmap and bigMetrics - - $bitmap->{$c} = $b; - $o0 = $o1; - } - - $offset += $o0; - } - } - - $self; -} - - -=head2 $t->update - -Update EBLC information using EBDT data. - -=cut - -sub get_regions -{ - my (@l) = @_; - my (@r) = (); - my ($e); - my ($first); - my ($last); - - $first = $l[0]; - $last = $first - 1; - foreach $e (@l) { - if ($last + 1 != $e) { # not contiguous - $r[++$#r] = [$first, $last]; - $first = $e; - } - - $last = $e; - } - - $r[++$#r] = [$first, $last]; - @r; -} - -sub update -{ - my ($self) = @_; - my ($eblc) = $self->{' PARENT'}->{'EBLC'}; - my ($bst_array) = []; - my ($offset) = 4; - my ($i); - my ($bitmap_array) = $self->{'bitmap'}; - my ($istao) = 8 + 48 * $eblc->{'Num'}; - - $eblc->{'bitmapSizeTable'} = $bst_array; - - for ($i = 0; $i < $eblc->{'Num'}; $i++) { - my ($bst) = {}; - my ($ist_array) = []; - my ($j); - my ($bitmap) = $bitmap_array->[$i]; - my (@regions) = get_regions(sort {$a <=> $b} keys (%$bitmap)); - my ($aotis) = 8 * (1+$#regions); - - $bst->{'indexFormat'} = 1; - $bst->{'imageFormat'} = 7; - $bst->{'imageDataOffset'} = $offset; - $bst->{'numberOfIndexSubTables'} = 1+$#regions; - $bst->{'indexSubTableArrayOffset'} = $istao; - $bst->{'colorRef'} = 0; - - $bst->{'startGlyphIndex'} = $regions[0][0]; - $bst->{'endGlyphIndex'} = $regions[-1][1]; - $bst->{'bitDepth'} = 1; - $bst->{'flags'} = 1; # Horizontal - $bst_array->[$i] = $bst; - - $eblc->{'indexSubTableArray'}[$i] = $ist_array; - for ($j = 0; $j <= $#regions; $j++) { - my ($ista) = {}; - my ($offsetArray) = []; - my ($p, $o0, $c); - $ist_array->[$j] = $ista; - - $ista->{'firstGlyphIndex'} = $regions[$j][0]; - $ista->{'lastGlyphIndex'} = $regions[$j][1]; - $ista->{'additionalOffsetToIndexSubtable'} = $aotis; - $eblc->{'indexSubTable'}[$i][$j] = $offsetArray; - $p = 0; - $o0 = 0; - for ($c = $regions[$j][0]; $c <= $regions[$j][1]; $c++) { - my ($b) = $bitmap->{$c}; - - $offsetArray->[$p++] = $o0; - $o0 += 8 + length($b->{'imageData'}); - } - - $offsetArray->[$p++] = $o0; - - $aotis += ($regions[$j][1] - $regions[$j][0] + 1 + 1)*4; - $offset += $o0; - - # Do we need the element of 0x10007 and absolute offset here, - # at the end of offsetArray? -# if ($j + 1 <= $#regions) { -# $offsetArray->[$p++] = 0x10007; -# $offsetArray->[$p++] = $offset; -# $aotis += 8; -# } - } - - $istao += $aotis + 8; - $bst->{'indexTablesSize'} = $aotis + 8; - } -} - -=head2 $t->out($fh) - -Outputs the bitmap data of embedded bitmap for this font. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($eblc) = $self->{' PARENT'}->{'EBLC'}; - my ($i); - my ($bitmap_array) = $self->{'bitmap'}; - - $fh->print(pack("N", 0x00020000)); - - for ($i = 0; $i < $eblc->{'Num'}; $i++) { - my ($j); - my ($bitmap) = $bitmap_array->[$i]; - my (@regions) = get_regions(sort {$a <=> $b} keys (%$bitmap)); - - for ($j = 0; $j <= $#regions; $j++) { - my ($c); - - for ($c = $regions[$j][0]; $c <= $regions[$j][1]; $c++) { - my ($b) = $bitmap->{$c}; - - $fh->print(pack("cccccccc", - $b->{'height'}, $b->{'width'}, - $b->{'horiBearingX'}, $b->{'horiBearingY'}, - $b->{'horiAdvance'}, $b->{'vertBearingX'}, - $b->{'vertBearingY'}, $b->{'vertAdvance'})); - $fh->print($b->{'imageData'}); - } - } - } -} - -1; - -=head1 BUGS - -Only Format 7 is implemented. XML output is not supported (yet). - -=head1 AUTHOR - -NIIBE Yutaka L. See L for copyright and -licensing. - -This was written at the CodeFest Akihabara 2006 hosted by FSIJ. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBLC.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBLC.pm deleted file mode 100644 index 7ba6e68..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/EBLC.pm +++ /dev/null @@ -1,228 +0,0 @@ -package Font::TTF::EBLC; - -=head1 NAME - -Font::TTF::EBLC - Embeeded Bitmap Location Table - -=head1 DESCRIPTION - -Contains the sizes and glyph ranges of bitmaps, and the offsets to -glyph bitmap data in indexSubTables for EBDT. - -Possibly contains glyph metrics information. - -=head1 INSTANCE VARIABLES -The information specified 'B<(R)>ead only' is read only, those -are calculated from EBDT, when it is 'update'-ed. - -=over 4 - -=item bitmapSizeTable -An array of tables of following information - -=over 8 -=item indexSubTableArrayOffset (R) -=item indexTablesSize (R) -=item numberOfIndexSubTables (R) -=item colorRef -=item hori -=item vert -=item startGlyphIndex (R) -=item endGlyphIndex (R) -=item ppemX -=item ppemY -=item bitDepth -=item flags -=back - -=item indexSubTableArray (R) -An array which contains range information. - -=item indexSubTable (R) -An array which contains offsets of EBDT table. - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the location information of embedded bitmap from the TTF file into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($i, $dat); - my ($indexSubTableArrayOffset, - $indexTablesSize, - $numberOfIndexSubTables, - $colorRef); - my ($startGlyphIndex, - $endGlyphIndex, - $ppemX, $ppemY, - $bitDepth, $flags); - my (@hori, @vert); - my ($bst, $ista, $ist); - my ($j); - - $self->SUPER::read or return $self; - - # eblcHeader - $fh->read($dat, 4); - $self->{'version'} = unpack("N",$dat); - - $fh->read($dat, 4); - $self->{'Num'} = unpack("N",$dat); - - # bitmapSizeTable - for ($i = 0; $i < $self->{'Num'}; $i++) { - $fh->read($dat, 16); - ($indexSubTableArrayOffset, $indexTablesSize, - $numberOfIndexSubTables, $colorRef) = unpack("NNNN", $dat); - $fh->read($dat, 12); @hori = unpack("cccccccccccc", $dat); - $fh->read($dat, 12); @vert = unpack("cccccccccccc", $dat); - - $fh->read($dat, 8); - ($startGlyphIndex, $endGlyphIndex, - $ppemX, $ppemY, $bitDepth, $flags) = unpack("nnCCCC", $dat); - - $self->{'bitmapSizeTable'}[$i] = { - 'indexSubTableArrayOffset' => $indexSubTableArrayOffset, - 'indexTablesSize' => $indexTablesSize, - 'numberOfIndexSubTables' => $numberOfIndexSubTables, - 'colorRef' => $colorRef, - 'hori' => [@hori], - 'vert' => [@vert], - 'startGlyphIndex' => $startGlyphIndex, - 'endGlyphIndex' => $endGlyphIndex, - 'ppemX' => $ppemX, - 'ppemY' => $ppemY, - 'bitDepth' => $bitDepth, - 'flags' => $flags - }; - } - - for ($i = 0; $i < $self->{'Num'}; $i++) { - my ($count, $x); - - $bst = $self->{'bitmapSizeTable'}[$i]; - - for ($j = 0; $j < $bst->{'numberOfIndexSubTables'}; $j++) { - $ista = {}; - - # indexSubTableArray - $self->{'indexSubTableArray'}[$i][$j] = $ista; - $fh->read($dat, 8); - ($ista->{'firstGlyphIndex'}, - $ista->{'lastGlyphIndex'}, - $ista->{'additionalOffsetToIndexSubtable'}) - = unpack("nnN", $dat); - } - - # indexSubTable - # indexSubHeader - $fh->read($dat, 8); - ($bst->{'indexFormat'}, - $bst->{'imageFormat'}, - $bst->{'imageDataOffset'}) = unpack("nnN", $dat); - - die "Only indexFormat == 1 is supported" unless ($bst->{'indexFormat'} == 1); - - for ($j = 0; $j < $bst->{'numberOfIndexSubTables'}; $j++) { - $ista = $self->{'indexSubTableArray'}[$i][$j]; - $count = $ista->{'lastGlyphIndex'} - $ista->{'firstGlyphIndex'} + 1 + 1; - $fh->seek($self->{' OFFSET'} + $bst->{'indexSubTableArrayOffset'} - + $ista->{'additionalOffsetToIndexSubtable'} + 8, 0); - -# $count += 2 if $j < $bst->{'numberOfIndexSubTables'} - 1; - - $fh->read($dat, 4*$count); - - $self->{'indexSubTable'}[$i][$j] = [unpack("N*", $dat)]; - } - } - - $self; -} - -=head2 $t->out($fh) - -Outputs the location information of embedded bitmap for this font. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($i); - my ($bst_array) = $self->{'bitmapSizeTable'}; - - $fh->print(pack("N", 0x00020000)); - $fh->print(pack("N", $self->{'Num'})); - - for ($i = 0; $i < $self->{'Num'}; $i++) { - my ($bst) = $bst_array->[$i]; - - $fh->print(pack("NNNN", - $bst->{'indexSubTableArrayOffset'}, - $bst->{'indexTablesSize'}, - $bst->{'numberOfIndexSubTables'}, - $bst->{'colorRef'})); - $fh->print(pack("cccccccccccc", @{$bst->{'hori'}})); - $fh->print(pack("cccccccccccc", @{$bst->{'vert'}})); - $fh->print(pack("nnCCCC", $bst->{'startGlyphIndex'}, - $bst->{'endGlyphIndex'}, $bst->{'ppemX'}, - $bst->{'ppemY'}, $bst->{'bitDepth'}, $bst->{'flags'})); - } - - for ($i = 0; $i < $self->{'Num'}; $i++) { - my ($bst) = $bst_array->[$i]; - my ($j); - - for ($j = 0; $j < $bst->{'numberOfIndexSubTables'}; $j++) { - my ($ista) = $self->{'indexSubTableArray'}[$i][$j]; - - $fh->print("nnN", - $ista->{'firstGlyphIndex'}, - $ista->{'lastGlyphIndex'}, - $ista->{'additionalOffsetToIndexSubtable'}); - } - - $fh->print(pack("nnN", $bst->{'indexFormat'}, $bst->{'imageFormat'}, - $bst->{'imageDataOffset'})); - - die "Only indexFormat == 1 is supported" unless ($bst->{'indexFormat'} == 1); - - for ($j = 0; $j < $bst->{'numberOfIndexSubTables'}; $j++) { - $fh->print(pack("N*", $self->{'indexSubTable'}[$i][$j])); - } - } -} - -1; - -=head1 BUGS - -Only indexFormat ==1 is implemented. XML output is not supported (yet). - -=head1 AUTHOR - -NIIBE Yutaka L. See L for copyright and -licensing. - -This was written at the CodeFest Akihabara 2006 hosted by FSIJ. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fdsc.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fdsc.pm deleted file mode 100644 index 3a81a11..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fdsc.pm +++ /dev/null @@ -1,125 +0,0 @@ -package Font::TTF::Fdsc; - -=head1 NAME - -Font::TTF::Fdsc - Font Descriptors table in a font - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=item version - -=item descriptors - -Hash keyed by descriptor tags - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields); -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $fh, $numDescs, $tag, $descs); - - $self->SUPER::read or return $self; - - $fh = $self->{' INFILE'}; - $fh->read($dat, 4); - $self->{'version'} = TTF_Unpack("v", $dat); - - $fh->read($dat, 4); - - foreach (1 .. unpack("N", $dat)) { - $fh->read($tag, 4); - $fh->read($dat, 4); - $descs->{$tag} = ($tag eq 'nalf') ? unpack("N", $dat) : TTF_Unpack("f", $dat); - } - - $self->{'descriptors'} = $descs; - - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($descs); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $fh->print(TTF_Pack("v", $self->{'version'})); - - $descs = $self->{'descriptors'} or {}; - - $fh->print(pack("N", scalar keys %$descs)); - foreach (sort keys %$descs) { - $fh->print($_); - $fh->print(($_ eq 'nalf') ? pack("N", $descs->{$_}) : TTF_Pack("f", $descs->{$_})); - } - - $self; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - my ($descs, $k); - - $self->read; - - $fh = 'STDOUT' unless defined $fh; - - $descs = $self->{'descriptors'}; - foreach $k (sort keys %$descs) { - if ($k eq 'nalf') { - $fh->printf("Descriptor '%s' = %d\n", $k, $descs->{$k}); - } - else { - $fh->printf("Descriptor '%s' = %f\n", $k, $descs->{$k}); - } - } - - $self; -} - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Feat.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Feat.pm deleted file mode 100644 index c837f41..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Feat.pm +++ /dev/null @@ -1,191 +0,0 @@ -package Font::TTF::Feat; - -=head1 NAME - -Font::TTF::Feat - Font Features - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=over 4 - -=item version - -=item features - -An array of hashes of the following form - -=over 8 - -=item feature - -feature id number - -=item name - -name index in name table - -=item exclusive - -exclusive flag - -=item settings - -hash of setting number against name string index - -=back - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); - -use Font::TTF::Utils; - -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the features from the TTF file into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($featureCount, $features); - - $self->SUPER::read_dat or return $self; - - ($self->{'version'}, $featureCount) = TTF_Unpack("vS", $self->{' dat'}); - - $features = []; - foreach (1 .. $featureCount) { - my ($feature, $nSettings, $settingTable, $featureFlags, $nameIndex) - = TTF_Unpack("SSLSS", substr($self->{' dat'}, $_ * 12, 12)); - push @$features, - { - 'feature' => $feature, - 'name' => $nameIndex, - 'exclusive' => (($featureFlags & 0x8000) != 0), - 'settings' => { TTF_Unpack("S*", substr($self->{' dat'}, $settingTable, $nSettings * 4)) } - }; - } - $self->{'features'} = $features; - - delete $self->{' dat'}; # no longer needed, and may become obsolete - - $self; -} - -=head2 $t->out($fh) - -Writes the features to a TTF file - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($features, $numFeatures, $settings, $featuresData, $settingsData); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $features = $self->{'features'}; - $numFeatures = @$features; - - foreach (@$features) { - $settings = $_->{'settings'}; - $featuresData .= TTF_Pack("SSLSS", - $_->{'feature'}, - scalar keys %$settings, - 12 + 12 * $numFeatures + length $settingsData, - ($_->{'exclusive'} ? 0x8000 : 0x0000), - $_->{'name'}); - foreach (sort {$a <=> $b} keys %$settings) { - $settingsData .= TTF_Pack("SS", $_, $settings->{$_}); - } - } - - $fh->print(TTF_Pack("vSSL", $self->{'version'}, $numFeatures, 0, 0)); - $fh->print($featuresData); - $fh->print($settingsData); - - $self; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - my ($names, $features, $settings); - - $self->read; - - $names = $self->{' PARENT'}->{'name'}; - $names->read; - - $fh = 'STDOUT' unless defined $fh; - - $features = $self->{'features'}; - foreach (@$features) { - $fh->printf("Feature %d, %s, name %d # '%s'\n", - $_->{'feature'}, - ($_->{'exclusive'} ? "exclusive" : "additive"), - $_->{'name'}, - $names->{'strings'}[$_->{'name'}][1][0]{0}); - $settings = $_->{'settings'}; - foreach (sort { $a <=> $b } keys %$settings) { - $fh->printf("\tSetting %d, name %d # '%s'\n", - $_, $settings->{$_}, $names->{'strings'}[$settings->{$_}][1][0]{0}); - } - } - - $self; -} - -sub settingName -{ - my ($self, $feature, $setting) = @_; - - $self->read; - - my $names = $self->{' PARENT'}->{'name'}; - $names->read; - - my $features = $self->{'features'}; - my ($featureEntry) = grep { $_->{'feature'} == $feature } @$features; - my $featureName = $names->{'strings'}[$featureEntry->{'name'}][1][0]{0}; - my $settingName = $featureEntry->{'exclusive'} - ? $names->{'strings'}[$featureEntry->{'settings'}->{$setting}][1][0]{0} - : $names->{'strings'}[$featureEntry->{'settings'}->{$setting & ~1}][1][0]{0} - . (($setting & 1) == 0 ? " On" : " Off"); - - ($featureName, $settingName); -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fmtx.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fmtx.pm deleted file mode 100644 index a9311df..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fmtx.pm +++ /dev/null @@ -1,108 +0,0 @@ -package Font::TTF::Fmtx; - -=head1 NAME - -Font::TTF::Fmtx - Font Metrics table - -=head1 DESCRIPTION - -This is a simple table with just standards specified instance variables - -=head1 INSTANCE VARIABLES - - version - glyphIndex - horizontalBefore - horizontalAfter - horizontalCaretHead - horizontalCaretBase - verticalBefore - verticalAfter - verticalCaretHead - verticalCaretBase - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); - -require Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'version' => 'v', - 'glyphIndex' => 'L', - 'horizontalBefore' => 'c', - 'horizontalAfter' => 'c', - 'horizontalCaretHead' => 'c', - 'horizontalCaretBase' => 'c', - 'verticalBefore' => 'c', - 'verticalAfter' => 'c', - 'verticalCaretHead' => 'c', - 'verticalCaretBase' => 'c'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory as instance variables - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read or return $self; - init unless defined $fields{'glyphIndex'}; - $self->{' INFILE'}->read($dat, 16); - - TTF_Read_Fields($self, $dat, \%fields); - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $fh->print(TTF_Out_Fields($self, \%fields, 16)); - $self; -} - - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Font.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Font.pm deleted file mode 100644 index 8f5cc50..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Font.pm +++ /dev/null @@ -1,767 +0,0 @@ -package Font::TTF::Font; - -=head1 NAME - -Font::TTF::Font - Memory representation of a font - -=head1 SYNOPSIS - -Here is the regression test (you provide your own font). Run it once and then -again on the output of the first run. There should be no differences between -the outputs of the two runs. - - $f = Font::TTF::Font->open($ARGV[0]); - - # force a read of all the tables - $f->tables_do(sub { $_[0]->read; }); - - # force read of all glyphs (use read_dat to use lots of memory!) - # $f->{'loca'}->glyphs_do(sub { $_[0]->read; }); - $f->{'loca'}->glyphs_do(sub { $_[0]->read_dat; }); - # NB. no need to $g->update since $f->{'glyf'}->out will do it for us - - $f->out($ARGV[1]); - $f->release; # clear up memory forcefully! - -=head1 DESCRIPTION - -A Truetype font consists of a header containing a directory of tables which -constitute the rest of the file. This class holds that header and directory and -also creates objects of the appropriate type for each table within the font. -Note that it does not read each table into memory, but creates a short reference -which can be read using the form: - - $f->{$tablename}->read; - -Classes are included that support many of the different TrueType tables. For -those for which no special code exists, the table type C is used, which -defaults to L. The current tables which are supported are: - - table Font::TTF::Table - for unknown tables - EBDT Font::TTF::EBDT - EBLC Font::TTF::EBLC - Feat Font::TTF::GrFeat - GDEF Font::TTF::GDEF - GPOS Font::TTF::GPOS - GSUB Font::TTF::GSUB - LTSH Font::TTF::LTSH - OS/2 Font::TTF::OS_2 - PCLT Font::TTF::PCLT - Sill Font::TTF::Sill - bsln Font::TTF::Bsln - cmap Font::TTF::Cmap - see also Font::TTF::OldCmap - cvt Font::TTF::Cvt_ - fdsc Font::TTF::Fdsc - feat Font::TTF::Feat - fmtx Font::TTF::Fmtx - fpgm Font::TTF::Fpgm - glyf Font::TTF::Glyf - see also Font::TTF::Glyph - hdmx Font::TTF::Hdmx - head Font::TTF::Head - hhea Font::TTF::Hhea - hmtx Font::TTF::Hmtx - kern Font::TTF::Kern - see alternative Font::TTF::AATKern - loca Font::TTF::Loca - maxp Font::TTF::Maxp - mort Font::TTF::Mort - see also Font::TTF::OldMort - name Font::TTF::Name - post Font::TTF::Post - prep Font::TTF::Prep - prop Font::TTF::Prop - vhea Font::TTF::Vhea - vmtx Font::TTF::Vmtx - -Links are: - -L -L L L -L L L L -L L L L L L -L L L L L -L L L L L -L L L L L -L L L L L -L L L - - -=head1 INSTANCE VARIABLES - -Instance variables begin with a space (and have lengths greater than the 4 -characters which make up table names). - -=over - -=item nocsum - -This is used during output to disable the creation of the file checksum in the -head table. For example, during DSIG table creation, this flag will be set to -ensure that the file checksum is left at zero. - -=item noharmony - -If set, do not harmonize the script and lang trees of GPOS and GSUB tables. See L for more info. - -=item fname (R) - -Contains the filename of the font which this object was read from. - -=item INFILE (P) - -The file handle which reflects the source file for this font. - -=item OFFSET (P) - -Contains the offset from the beginning of the read file of this particular -font directory, thus providing support for TrueType Collections. - -=back - -=head1 METHODS - -=cut - -use IO::File; - -use strict; -use vars qw(%tables $VERSION $dumper); -use Symbol(); - -require 5.004; - -$VERSION = 0.38; # MJPH 2-FEB-2008 Add Sill table -# $VERSION = 0.37; # MJPH 7-OCT-2005 Force hhea update if dirty, give more OS/2 stuff in update -# $VERSION = 0.36; # MJPH 19-AUG-2005 Change cmap::reverse api to be opts based -# $VERSION = 0.35; # MJPH 4-MAY-2004 Various fixes to OpenType stuff, separate off scripts -# $VERSION = 0.34; # MJPH 22-MAY-2003 Update PSNames to latest AGL -# $VERSION = 0.33; # MJPH 9-OCT-2002 Support CFF OpenType (just by version=='OTTO'?!) -# $VERSION = 0.32; # MJPH 2-OCT-2002 Bug fixes to TTFBuilder, new methods and some -# extension table support in Ttopen and Coverage -# $VERSION = 0.31; # MJPH 1-JUL-2002 fix read format 12 cmap (bart@cs.pdx.edu) -# improve surrogate support in ttfremap -# fix return warn to return warn,undef -# ensure correct indexToLocFormat -# $VERSION = 0.30; # MJPH 28-MAY-2002 add updated release -# $VERSION = 0.29; # MJPH 9-APR-2002 update ttfbuilder, sort out surrogates -# $VERSION = 0.28; # MJPH 13-MAR-2002 update ttfbuilder, add Font::TTF::Cmap::ms_enc() -# $VERSION = 0.27; # MJPH 6-FEB-2002 update ttfbuilder, support no fpgm, no more __DATA__ -# $VERSION = 0.26; # MJPH 19-SEP-2001 Update ttfbuilder -# $VERSION = 0.25; # MJPH 18-SEP-2001 problems in update of head -# $VERSION = 0.24; # MJPH 1-AUG-2001 Sort out update -# $VERSION = 0.23; # GST 30-MAY-2001 Memory leak fixed -# $VERSION = 0.22; # MJPH 09-APR-2001 Ensure all of AAT stuff included -# $VERSION = 0.21; # MJPH 23-MAR-2001 Improve Opentype support -# $VERSION = 0.20; # MJPH 13-JAN-2001 Add XML output and some of XML input, AAT & OT tables -# $VERSION = 0.19; # MJPH 29-SEP-2000 Add cmap::is_unicode, debug makefile.pl -# $VERSION = 0.18; # MJPH 21-JUL-2000 Debug Utils::TTF_bininfo -# $VERSION = 0.17; # MJPH 16-JUN-2000 Add utf8 support to names -# $VERSION = 0.16; # MJPH 26-APR-2000 Mark read tables as read, tidy up POD -# $VERSION = 0.15; # MJPH 5-FEB-2000 Ensure right versions released -# $VERSION = 0.14; # MJPH 11-SEP-1999 Sort out Unixisms, agian! -# $VERSION = 0.13; # MJPH 9-SEP-1999 Add empty, debug update_bbox -# $VERSION = 0.12; # MJPH 22-JUL-1999 Add update_bbox -# $VERSION = 0.11; # MJPH 7-JUL-1999 Don't store empties in cmaps -# $VERSION = 0.10; # MJPH 21-JUN-1999 Use IO::File -# $VERSION = 0.09; # MJPH 9-JUN-1999 Add 5.004 require, minor tweeks in cmap -# $VERSION = 0.08; # MJPH 19-MAY-1999 Sort out line endings for Unix -# $VERSION = 0.07; # MJPH 28-APR-1999 Get the regression tests to work -# $VERSION = 0.06; # MJPH 26-APR-1999 Start to add to CVS, correct MANIFEST.SKIP -# $VERSION = 0.05; # MJPH 13-APR-1999 See changes for 0.05 -# $VERSION = 0.04; # MJPH 13-MAR-1999 Tidy up Tarball -# $VERSION = 0.03; # MJPH 9-MAR-1999 Move to Font::TTF for CPAN -# $VERSION = 0.02; # MJPH 12-FEB-1999 Add support for ' nocsum' for DSIGS -# $VERSION = 0.0001; - -%tables = ( - 'table' => 'Font::TTF::Table', - 'EBDT' => 'Font::TTF::EBDT', - 'EBLC' => 'Font::TTF::EBLC', - 'Feat' => 'Font::TTF::GrFeat', - 'GDEF' => 'Font::TTF::GDEF', - 'GPOS' => 'Font::TTF::GPOS', - 'GSUB' => 'Font::TTF::GSUB', - 'LTSH' => 'Font::TTF::LTSH', - 'OS/2' => 'Font::TTF::OS_2', - 'PCLT' => 'Font::TTF::PCLT', - 'Sill' => 'Font::TTF::Sill', - 'bsln' => 'Font::TTF::Bsln', - 'cmap' => 'Font::TTF::Cmap', - 'cvt ' => 'Font::TTF::Cvt_', - 'fdsc' => 'Font::TTF::Fdsc', - 'feat' => 'Font::TTF::Feat', - 'fmtx' => 'Font::TTF::Fmtx', - 'fpgm' => 'Font::TTF::Fpgm', - 'glyf' => 'Font::TTF::Glyf', - 'hdmx' => 'Font::TTF::Hdmx', - 'head' => 'Font::TTF::Head', - 'hhea' => 'Font::TTF::Hhea', - 'hmtx' => 'Font::TTF::Hmtx', - 'kern' => 'Font::TTF::Kern', - 'loca' => 'Font::TTF::Loca', - 'maxp' => 'Font::TTF::Maxp', - 'mort' => 'Font::TTF::Mort', - 'name' => 'Font::TTF::Name', - 'post' => 'Font::TTF::Post', - 'prep' => 'Font::TTF::Prep', - 'prop' => 'Font::TTF::Prop', - 'vhea' => 'Font::TTF::Vhea', - 'vmtx' => 'Font::TTF::Vmtx', - ); - -# This is special code because I am fed up of every time I x a table in the debugger -# I get the whole font printed. Thus substitutes my 3 line change to dumpvar into -# the debugger. Clunky, but nice. You are welcome to a copy if you want one. - -BEGIN { - my ($p); - - foreach $p (@INC) - { - if (-f "$p/mydumpvar.pl") - { - $dumper = 'mydumpvar.pl'; - last; - } - } - $dumper ||= 'dumpvar.pl'; -} - -sub main::dumpValue -{ do $dumper; &main::dumpValue; } - - -=head2 Font::TTF::Font->AddTable($tablename, $class) - -Adds the given class to be used when representing the given table name. It also -'requires' the class for you. - -=cut - -sub AddTable -{ - my ($class, $table, $useclass) = @_; - - $tables{$table} = $useclass; -# $useclass =~ s|::|/|oig; -# require "$useclass.pm"; -} - - -=head2 Font::TTF::Font->Init - -For those people who like making fonts without reading them. This subroutine -will require all the table code for the various table types for you. Not -needed if using Font::TTF::Font::read before using a table. - -=cut - -sub Init -{ - my ($class) = @_; - my ($t); - - foreach $t (values %tables) - { - $t =~ s|::|/|oig; - require "$t.pm"; - } -} - -=head2 Font::TTF::Font->new(%props) - -Creates a new font object and initialises with the given properties. This is -primarily for use when a TTF is embedded somewhere. Notice that the properties -are automatically preceded by a space when inserted into the object. This is in -order that fields do not clash with tables. - -=cut - -sub new -{ - my ($class, %props) = @_; - my ($self) = {}; - - bless $self, $class; - - foreach (keys %props) - { $self->{" $_"} = $props{$_}; } - $self; -} - - -=head2 Font::TTF::Font->open($fname) - -Reads the header and directory for the given font file and creates appropriate -objects for each table in the font. - -=cut - -sub open -{ - my ($class, $fname) = @_; - my ($fh); - my ($self) = {}; - - unless (ref($fname)) - { - $fh = IO::File->new($fname) or return undef; - binmode $fh; - } else - { $fh = $fname; } - - $self->{' INFILE'} = $fh; - $self->{' fname'} = $fname; - $self->{' OFFSET'} = 0; - bless $self, $class; - - $self->read; -} - -=head2 $f->read - -Reads a Truetype font directory starting from the current location in the file. -This has been separated from the C function to allow support for embedded -TTFs for example in TTCs. Also reads the C and C tables immediately. - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($dat, $i, $ver, $dir_num, $type, $name, $check, $off, $len, $t); - - $fh->seek($self->{' OFFSET'}, 0); - $fh->read($dat, 12); - ($ver, $dir_num) = unpack("Nn", $dat); - $ver == 1 << 16 || $ver == unpack('N', 'OTTO') || $ver == 0x74727565 or return undef; # support Mac sfnts - - for ($i = 0; $i < $dir_num; $i++) - { - $fh->read($dat, 16) || die "Reading table entry"; - ($name, $check, $off, $len) = unpack("a4NNN", $dat); - $self->{$name} = $self->{' PARENT'}->find($self, $name, $check, $off, $len) && next - if (defined $self->{' PARENT'}); - $type = $tables{$name} || 'Font::TTF::Table'; - $t = $type; - if ($^O eq "MacOS") - { $t =~ s/^|::/:/oig; } - else - { $t =~ s|::|/|oig; } - require "$t.pm"; - $self->{$name} = $type->new(PARENT => $self, - NAME => $name, - INFILE => $fh, - OFFSET => $off, - LENGTH => $len, - CSUM => $check); - } - - foreach $t ('head', 'maxp') - { $self->{$t}->read if defined $self->{$t}; } - - $self; -} - - -=head2 $f->out($fname [, @tablelist]) - -Writes a TTF file consisting of the tables in tablelist. The list is checked to -ensure that only tables that exist are output. (This means that you can't have -non table information stored in the font object with key length of exactly 4) - -In many cases the user simply wants to output all the tables in alphabetical order. -This can be done by not including a @tablelist, in which case the subroutine will -output all the defined tables in the font in alphabetical order. - -Returns $f on success and undef on failure, including warnings. - -All output files must include the C table. - -=cut - -sub out -{ - my ($self, $fname, @tlist) = @_; - my ($fh); - my ($dat, $numTables, $sRange, $eSel); - my (%dir, $k, $mloc, $count); - my ($csum, $lsum, $msum, $loc, $oldloc, $len, $shift); - - unless (ref($fname)) - { - $fh = IO::File->new("+>$fname") || return warn("Unable to open $fname for writing"), undef; - binmode $fh; - } else - { $fh = $fname; } - - $self->{' oname'} = $fname; - $self->{' outfile'} = $fh; - - if ($self->{' wantsig'}) - { - $self->{' nocsum'} = 1; -# $self->{'head'}{'checkSumAdjustment'} = 0; - $self->{' tempDSIG'} = $self->{'DSIG'}; - $self->{' tempcsum'} = $self->{'head'}{' CSUM'}; - delete $self->{'DSIG'}; - @tlist = sort {$self->{$a}{' OFFSET'} <=> $self->{$b}{' OFFSET'}} - grep (length($_) == 4 && defined $self->{$_}, keys %$self) if ($#tlist < 0); - } - elsif ($#tlist < 0) - { @tlist = sort keys %$self; } - - @tlist = grep(length($_) == 4 && defined $self->{$_}, @tlist); - $numTables = $#tlist + 1; - $numTables++ if ($self->{' wantsig'}); - - ($numTables, $sRange, $eSel, $shift) = Font::TTF::Utils::TTF_bininfo($numTables, 16); - $dat = pack("Nnnnn", 1 << 16, $numTables, $sRange, $eSel, $shift); - $fh->print($dat); - $msum = unpack("%32N*", $dat); - -# reserve place holders for each directory entry - foreach $k (@tlist) - { - $dir{$k} = pack("A4NNN", $k, 0, 0, 0); - $fh->print($dir{$k}); - } - - $fh->print(pack('A4NNN', '', 0, 0, 0)) if ($self->{' wantsig'}); - - $loc = $fh->tell(); - if ($loc & 3) - { - $fh->print(substr("\000" x 4, $loc & 3)); - $loc += 4 - ($loc & 3); - } - - foreach $k (@tlist) - { - $oldloc = $loc; - $self->{$k}->out($fh); - $loc = $fh->tell(); - $len = $loc - $oldloc; - if ($loc & 3) - { - $fh->print(substr("\000" x 4, $loc & 3)); - $loc += 4 - ($loc & 3); - } - $fh->seek($oldloc, 0); - $csum = 0; $mloc = $loc; - while ($mloc > $oldloc) - { - $count = ($mloc - $oldloc > 4096) ? 4096 : $mloc - $oldloc; - $fh->read($dat, $count); - $csum += unpack("%32N*", $dat); -# this line ensures $csum stays within 32 bit bounds, clipping as necessary - if ($csum > 0xffffffff) { $csum -= 0xffffffff; $csum--; } - $mloc -= $count; - } - $dir{$k} = pack("A4NNN", $k, $csum, $oldloc, $len); - $msum += $csum + unpack("%32N*", $dir{$k}); - while ($msum > 0xffffffff) { $msum -= 0xffffffff; $msum--; } - $fh->seek($loc, 0); - } - - unless ($self->{' nocsum'}) # assuming we want a file checksum - { -# Now we need to sort out the head table's checksum - if (!defined $dir{'head'}) - { # you have to have a head table - $fh->close(); - return warn("No 'head' table to output in $fname"), undef; - } - ($csum, $loc, $len) = unpack("x4NNN", $dir{'head'}); - $fh->seek($loc + 8, 0); - $fh->read($dat, 4); - $lsum = unpack("N", $dat); - if ($lsum != 0) - { - $csum -= $lsum; - if ($csum < 0) { $csum += 0xffffffff; $csum++; } - $msum -= $lsum * 2; # twice (in head and in csum) - while ($msum < 0) { $msum += 0xffffffff; $msum++; } - } - $lsum = 0xB1B0AFBA - $msum; - $fh->seek($loc + 8, 0); - $fh->print(pack("N", $lsum)); - $dir{'head'} = pack("A4NNN", 'head', $csum, $loc, $len); - } elsif ($self->{' wantsig'}) - { - if (!defined $dir{'head'}) - { # you have to have a head table - $fh->close(); - return warn("No 'head' table to output in $fname"), undef; - } - ($csum, $loc, $len) = unpack("x4NNN", $dir{'head'}); - $fh->seek($loc + 8, 0); - $fh->print(pack("N", 0)); -# $dir{'head'} = pack("A4NNN", 'head', $self->{' tempcsum'}, $loc, $len); - } - -# Now we can output the directory again - if ($self->{' wantsig'}) - { @tlist = sort @tlist; } - $fh->seek(12, 0); - foreach $k (@tlist) - { $fh->print($dir{$k}); } - $fh->print(pack('A4NNN', '', 0, 0, 0)) if ($self->{' wantsig'}); - $fh->close(); - $self; -} - - -=head2 $f->out_xml($filename [, @tables]) - -Outputs the font in XML format - -=cut - -sub out_xml -{ - my ($self, $fname, @tlist) = @_; - my ($fh, $context, $numTables, $k); - - $context->{'indent'} = ' ' x 4; - - unless (ref($fname)) - { - $fh = IO::File->new("+>$fname") || return warn("Unable to open $fname"), undef; - binmode $fh; - } else - { $fh = $fname; } - - unless (scalar @tlist > 0) - { - @tlist = sort keys %$self; - @tlist = grep(length($_) == 4 && defined $self->{$_}, @tlist); - } - $numTables = $#tlist + 1; - - $context->{'fh'} = $fh; - $fh->print("\n"); - $fh->print("\n\n"); - - foreach $k (@tlist) - { - $fh->print("
    \n"); - $self->{$k}->out_xml($context, $context->{'indent'}); - $fh->print("
    \n"); - } - - $fh->print("\n"); - $fh->close; - $self; -} - - -=head2 $f->XML_start($context, $tag, %attrs) - -Handles start messages from the XML parser. Of particular interest to us are and -. - -=cut - -sub XML_start -{ - my ($self, $context, $tag, %attrs) = @_; - my ($name, $type, $t); - - if ($tag eq 'font') - { $context->{'tree'}[-1] = $self; } - elsif ($tag eq 'table') - { - $name = $attrs{'name'}; - unless (defined $self->{$name}) - { - $type = $tables{$name} || 'Font::TTF::Table'; - $t = $type; - if ($^O eq "MacOS") - { $t =~ s/^|::/:/oig; } - else - { $t =~ s|::|/|oig; } - require "$t.pm"; - $self->{$name} = $type->new('PARENT' => $self, 'NAME' => $name, 'read' => 1); - } - $context->{'receiver'} = ($context->{'tree'}[-1] = $self->{$name}); - } - $context; -} - - -sub XML_end -{ - my ($self) = @_; - my ($context, $tag, %attrs) = @_; - my ($i); - - return undef unless ($tag eq 'table' && $attrs{'name'} eq 'loca'); - if (defined $context->{'glyphs'} && $context->{'glyphs'} ne $self->{'loca'}{'glyphs'}) - { - for ($i = 0; $i <= $#{$context->{'glyphs'}}; $i++) - { $self->{'loca'}{'glyphs'}[$i] = $context->{'glyphs'}[$i] if defined $context->{'glyphs'}[$i]; } - $context->{'glyphs'} = $self->{'loca'}{'glyphs'}; - } - return undef; -} - -=head2 $f->update - -Sends update to all the tables in the font and then resets all the isDirty -flags on each table. The data structure in now consistent as a font (we hope). - -=cut - -sub update -{ - my ($self) = @_; - - $self->tables_do(sub { $_[0]->update; }); - - $self; -} - -=head2 $f->dirty - -Dirties all the tables in the font - -=cut - -sub dirty -{ $_[0]->tables_do(sub { $_[0]->dirty; }); $_[0]; } - -=head2 $f->tables_do(&func [, tables]) - -Calls &func for each table in the font. Calls the table in alphabetical sort -order as per the order in the directory: - - &func($table, $name); - -May optionally take a list of table names in which case func is called -for each of them in the given order. -=cut - -sub tables_do -{ - my ($self, $func, @tables) = @_; - my ($t); - - foreach $t (@tables ? @tables : sort grep {length($_) == 4} keys %$self) - { &$func($self->{$t}, $t); } - $self; -} - - -=head2 $f->release - -Releases ALL of the memory used by the TTF font and all of its component -objects. After calling this method, do B expect to have anything left in -the C object. - -B, that it is important that you call this method on any -C object when you wish to destruct it and free up its memory. -Internally, we track things in a structure that can result in circular -references, and without calling 'C' these will not properly get -cleaned up by Perl. Once you've called this method, though, don't expect to be -able to do anything else with the C object; it'll have B -internal state whatsoever. - -B As part of the brute-force cleanup done here, this method -will throw a warning message whenever unexpected key values are found within -the C object. This is done to help ensure that any unexpected -and unfreed values are brought to your attention so that you can bug us to keep -the module updated properly; otherwise the potential for memory leaks due to -dangling circular references will exist. - -=cut - -sub release -{ - my ($self) = @_; - -# delete stuff that we know we can, here - - my @tofree = map { delete $self->{$_} } keys %{$self}; - - while (my $item = shift @tofree) - { - my $ref = ref($item); - if (UNIVERSAL::can($item, 'release')) - { $item->release(); } - elsif ($ref eq 'ARRAY') - { push( @tofree, @{$item} ); } - elsif (UNIVERSAL::isa($ref, 'HASH')) - { release($item); } - } - -# check that everything has gone - it better had! - foreach my $key (keys %{$self}) - { warn ref($self) . " still has '$key' key left after release.\n"; } -} - -1; - -=head1 BUGS - -Bugs abound aplenty I am sure. There is a lot of code here and plenty of scope. -The parts of the code which haven't been implemented yet are: - -=over 4 - -=item Post - -Version 4 format types are not supported yet. - -=item Cmap - -Format type 2 (MBCS) has not been implemented yet and therefore may cause -somewhat spurious results for this table type. - -=item Kern - -Only type 0 & type 2 tables are supported (type 1 & type 3 yet to come). - -=item TTC - -The current Font::TTF::Font::out method does not support the writing of TrueType -Collections. - -=back - -In addition there are weaknesses or features of this module library - -=over 4 - -=item * - -There is very little (or no) error reporting. This means that if you have -garbled data or garbled data structures, then you are liable to generate duff -fonts. - -=item * - -The exposing of the internal data structures everywhere means that doing -radical re-structuring is almost impossible. But it stop the code from becoming -ridiculously large. - -=back - -Apart from these, I try to keep the code in a state of "no known bugs", which -given the amount of testing this code has had, is not a guarantee of high -quality, yet. - -For more details see the appropriate class files. - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org - -Copyright Martin Hosken 1998. - -No warranty or expression of effectiveness, least of all regarding anyone's -safety, is implied in this software or documentation. - -=head2 Licensing - -The Perl TTF module is licensed under the Perl Artistic License. - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fpgm.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fpgm.pm deleted file mode 100644 index 4cc7709..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Fpgm.pm +++ /dev/null @@ -1,87 +0,0 @@ -package Font::TTF::Fpgm; - -=head1 NAME - -Font::TTF::Fpgm - Font program in a TrueType font. Called when a font is loaded - -=head1 DESCRIPTION - -This is a minimal class adding nothing beyond a table, but is a repository -for fpgm type information for those processes brave enough to address hinting. - -=cut - -use strict; -use vars qw(@ISA $VERSION); - -@ISA = qw(Font::TTF::Table); - -$VERSION = 0.0001; - -=head2 $t->read - -Reading this table is simply a process of reading all the data into the RAM -copy. Nothing more is done with it. - -=cut - -sub read -{ - $_[0]->read_dat; - $_[0]->{' read'} = 1; -} - -=head2 $t->out_xml($context, $depth) - -Outputs Fpgm program as XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - my ($dat); - - $self->read; - $dat = Font::TTF::Utils::XML_binhint($self->{' dat'}); - $dat =~ s/\n(?!$)/\n$depth$context->{'indent'}/omg; - $fh->print("$depth\n"); - $fh->print("$depth$context->{'indent'}$dat"); - $fh->print("$depth\n"); - $self; -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Parse all that hinting code - -=cut - -sub XML_end -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag eq 'code') - { - $self->{' dat'} = Font::TTF::Utils::XML_hintbin($context->{'text'}); - return $context; - } else - { return $self->SUPER::XML_end(@_); } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GDEF.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GDEF.pm deleted file mode 100644 index 9519ee8..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GDEF.pm +++ /dev/null @@ -1,313 +0,0 @@ -package Font::TTF::GDEF; - -=head1 NAME - -Font::TTF::GDEF - Opentype GDEF table support - -=head1 DESCRIPTION - -The GDEF table contains various global lists of information which are apparantly -used in other places in an OpenType renderer. But precisely where is open to -speculation... - -=head1 INSTANCE VARIABLES - -There are 4 tables in the GDEF table, each with their own structure: - -=over 4 - -=item GLYPH - -This is an L Class Definition table containing information -as to what type each glyph is. - -=item ATTACH - -The attach table consists of a coverage table and then attachment points for -each glyph in the coverage table: - -=over 8 - -=item COVERAGE - -This is a coverage table - -=item POINTS - -This is an array of point elements. Each element is an array of curve points -corresponding to the attachment points on that glyph. The order of the curve points -in the array corresponds to the attachment point number specified in the MARKS -coverage table (see below). - -=back - -=item LIG - -This contains the ligature caret positioning information for ligature glyphs - -=over 8 - -=item COVERAGE - -A coverage table to say which glyphs are ligatures - -=item LIGS - -An array of elements for each ligature. Each element is an array of information -for each caret position in the ligature (there being number of components - 1 of -these, generally) - -=over 12 - -=item FMT - -This is the format of the information and is important to provide the semantics -for the value. This value must be set correctly before output - -=item VAL - -The value which has meaning according to FMT - -=item DEVICE - -For FMT = 3, a device table is also referenced which is stored here - -=back - -=back - -=item MARKS - -Due to confusion in the GDEF specification, this field is currently withdrawn until -the confusion is resolved. That way, perhaps this stuff will work! - -This class definition table stores the mark attachment point numbers for each -attachment mark, to indicate which attachment point the mark attaches to on its -base glyph. - -=back - - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Table; -use Font::TTF::Utils; -use Font::TTF::Ttopen; -use vars qw(@ISA $new_gdef); - -@ISA = qw(Font::TTF::Table); -$new_gdef = 1; - -=head2 $t->read - -Reads the table into the data structure - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($boff) = $self->{' OFFSET'}; - my ($dat, $goff, $loff, $aoff, $moff, $r, $s, $bloc); - - $self->SUPER::read or return $self; - $bloc = $fh->tell(); - if ($new_gdef) - { - $fh->read($dat, 12); - ($self->{'Version'}, $goff, $aoff, $loff, $moff) = TTF_Unpack('fS4', $dat); - } - else - { - $fh->read($dat, 10); - ($self->{'Version'}, $goff, $aoff, $loff) = TTF_Unpack('fS3', $dat); - } - - if ($goff > 0) - { - $fh->seek($goff + $boff, 0); - $self->{'GLYPH'} = Font::TTF::Coverage->new(0)->read($fh); - } - - if ($new_gdef && $moff > 0 && $moff < $self->{' LENGTH'}) - { - $fh->seek($moff + $boff, 0); - $self->{'MARKS'} = Font::TTF::Coverage->new(0)->read($fh); - } - - if ($aoff > 0) - { - my ($off, $gcount, $pcount); - - $fh->seek($aoff + $boff, 0); - $fh->read($dat, 4); - ($off, $gcount) = TTF_Unpack('SS', $dat); - $fh->read($dat, $gcount << 1); - - $fh->seek($aoff + $boff + $off, 0); - $self->{'ATTACH'}{'COVERAGE'} = Font::TTF::Coverage->new(1)->read($fh); - - foreach $r (TTF_Unpack('S*', $dat)) - { - unless ($r) - { - push (@{$self->{'ATTACH'}{'POINTS'}}, []); - next; - } - $fh->seek($aoff + $boff + $r, 0); - $fh->read($dat, 2); - $pcount = TTF_Unpack('S', $dat); - $fh->read($dat, $pcount << 1); - push (@{$self->{'ATTACH'}{'POINTS'}}, [TTF_Unpack('S*', $dat)]); - } - } - - if ($loff > 0) - { - my ($lcount, $off, $ccount, $srec, $comp); - - $fh->seek($loff + $boff, 0); - $fh->read($dat, 4); - ($off, $lcount) = TTF_Unpack('SS', $dat); - $fh->read($dat, $lcount << 1); - - $fh->seek($off + $loff + $boff, 0); - $self->{'LIG'}{'COVERAGE'} = Font::TTF::Coverage->new(1)->read($fh); - - foreach $r (TTF_Unpack('S*', $dat)) - { - $fh->seek($r + $loff + $boff, 0); - $fh->read($dat, 2); - $ccount = TTF_Unpack('S', $dat); - $fh->read($dat, $ccount << 1); - - $srec = []; - foreach $s (TTF_Unpack('S*', $dat)) - { - $comp = {}; - $fh->seek($s + $r + $loff + $boff, 0); - $fh->read($dat, 4); - ($comp->{'FMT'}, $comp->{'VAL'}) = TTF_Unpack('S*', $dat); - if ($comp->{'FMT'} == 3) - { - $fh->read($dat, 2); - $off = TTF_Unpack('S', $dat); - if (defined $self->{' CACHE'}{$off + $s + $r}) - { $comp->{'DEVICE'} = $self->{' CACHE'}{$off + $s + $r}; } - else - { - $fh->seek($off + $s + $r + $loff + $boff, 0); - $comp->{'DEVICE'} = Font::TTF::Delta->new->read($fh); - $self->{' CACHE'}{$off + $s + $r} = $comp->{'DEVICE'}; - } - } - push (@$srec, $comp); - } - push (@{$self->{'LIG'}{'LIGS'}}, $srec); - } - } - - $self; -} - - -=head2 $t->out($fh) - -Writes out this table. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($goff, $aoff, $loff, $moff, @offs, $loc1, $coff, $loc); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $loc = $fh->tell(); - if ($new_gdef) - { $fh->print(TTF_Pack('fSSSS', $self->{'Version'}, 0, 0, 0, 0)); } - else - { $fh->print(TTF_Pack('fSSS', $self->{'Version'}, 0, 0, 0)); } - - if (defined $self->{'GLYPH'}) - { - $goff = $fh->tell() - $loc; - $self->{'GLYPH'}->out($fh); - } - - if (defined $self->{'ATTACH'}) - { - my ($r); - - $aoff = $fh->tell() - $loc; - $fh->print(pack('n*', (0) x ($#{$self->{'ATTACH'}{'POINTS'}} + 3))); - foreach $r (@{$self->{'ATTACH'}{'POINTS'}}) - { - push (@offs, $fh->tell() - $loc - $aoff); - $fh->print(pack('n*', $#{$r} + 1, @$r)); - } - $coff = $fh->tell() - $loc - $aoff; - $self->{'ATTACH'}{'COVERAGE'}->out($fh); - $loc1 = $fh->tell(); - $fh->seek($aoff + $loc, 0); - $fh->print(pack('n*', $coff, $#offs + 1, @offs)); - $fh->seek($loc1, 0); - } - - if (defined $self->{'LIG'}) - { - my (@reftables, $ltables, $i, $j, $out, $r, $s); - - $ltables = {}; - $loff = $fh->tell() - $loc; - $out = pack('n*', - Font::TTF::Ttopen::ref_cache($self->{'LIG'}{'COVERAGE'}, $ltables, 0), - $#{$self->{'LIG'}{'LIGS'}} + 1, - (0) x ($#{$self->{'LIG'}{'LIGS'}} + 1)); - push (@reftables, [$ltables, 0]); - $i = 0; - foreach $r (@{$self->{'LIG'}{'LIGS'}}) - { - $ltables = {}; - $loc1 = length($out); - substr($out, ($i << 1) + 4, 2) = TTF_Pack('S', $loc1); - $out .= pack('n*', $#{$r} + 1, (0) x ($#{$r} + 1)); - @offs = (); $j = 0; - foreach $s (@$r) - { - substr($out, ($j << 1) + 2 + $loc1, 2) = - TTF_Pack('S', length($out) - $loc1); - $out .= TTF_Pack('SS', $s->{'FMT'}, $s->{'VAL'}); - $out .= pack('n', Font::TTF::Ttopen::ref_cache($s->{'DEVICE'}, - $ltables, length($out))) if ($s->{'FMT'} == 3); - $j++; - } - push (@reftables, [$ltables, $loc1]); - $i++; - } - Font::TTF::Ttopen::out_final($fh, $out, \@reftables); - } - - if ($new_gdef && defined $self->{'MARKS'}) - { - $moff = $fh->tell() - $loc; - $self->{'MARKS'}->out($fh); - } - - $loc1 = $fh->tell(); - $fh->seek($loc + 4, 0); - if ($new_gdef) - { $fh->print(TTF_Pack('S4', $goff, $aoff, $loff, $moff)); } - else - { $fh->print(TTF_Pack('S3', $goff, $aoff, $loff)); } - $fh->seek($loc1, 0); - $self; -} - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GPOS.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GPOS.pm deleted file mode 100644 index 8e8b7ce..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GPOS.pm +++ /dev/null @@ -1,701 +0,0 @@ -package Font::TTF::GPOS; - -=head1 NAME - -Font::TTF::GPOS - Support for Opentype GPOS tables in conjunction with TTOpen - -=head1 DESCRIPTION - -The GPOS table is one of the most complicated tables in the TTF spec and the -corresponding data structure abstraction is also not trivial. While much of the -structure of a GPOS is shared with a GSUB table via the L - -=head1 INSTANCE VARIABLES - -Here we describe the additions and lookup specific information for GPOS tables. -Unfortunately there is no one abstraction which seems to work comfortable for -all GPOS tables, so we will also examine how the variables are used for different -lookup types. - -The following are the values allowed in the ACTION_TYPE and MATCH_TYPE variables: - -=over 4 - -=item ACTION_TYPE - -This can take any of the following values - -=over 8 - -=item a - -The ACTION is an array of anchor tables - -=item o - -Offset. There is no RULE array. The ADJUST variable contains a value record (see -later in this description) - -=item v - -The ACTION is a value record. - -=item p - -Pair adjustment. The ACTION contains an array of two value records for the matched -two glyphs. - -=item e - -Exit and Entry records. The ACTION contains an array of two anchors corresponding -to the exit and entry anchors for the glyph. - -=item l - -Indicates a lookup based contextual rule as per the GSUB table. - -=back - -=item MATCH_TYPE - -This can take any of the following values - -=over 8 - -=item g - -A glyph array - -=item c - -An array of class values - -=item o - -An array of coverage tables - -=back - -=back - -The following variables are added for Attachment Positioning Subtables: - -=over 4 - -=item MATCH - -This contains an array of glyphs to match against for all RULES. It is much like -having the same MATCH string in all RULES. In the cases it is used so far, it only -ever contains one element. - -=item MARKS - -This contains a Mark array consisting of each element being a subarray of two -elements: - -=over 8 - -=item CLASS - -The class that this mark uses on its base - -=item ANCHOR - -The anchor with which to attach this mark glyph - -=back - -The base table for mark to base, ligature or mark attachment positioning is -structured with the ACTION containing an array of anchors corresponding to each -attachment class. For ligatures, there is more than one RULE in the RULE array -corresponding to each glyph in the coverage table. - -=back - -Other variables which are provided for informational purposes are: - -=over 4 - -=item VFMT - -Value format for the adjustment of the glyph matched by the coverage table. - -=item VFMT2 - -Value format used in pair adjustment for the second glyph in the pair - -=back - -=head2 Value Records - -There is a subtype used in GPOS tables called a value record. It is used to adjust -the position of a glyph from its default position. The value record is variable -length with a bitfield at the beginning to indicate which of the following -entries are included. The bitfield is not stored since it is recalculated at -write time. - -=over 4 - -=item XPlacement - -Horizontal adjustment for placement (not affecting other unattached glyphs) - -=item YPlacement - -Vertical adjustment for placement (not affecting other unattached glyphs) - -=item XAdvance - -Adjust the advance width glyph (used only in horizontal writing systems) - -=item YAdvance - -Adjust the vertical advance (used only in vertical writing systems) - -=item XPlaDevice - -Device table for device specific adjustment of horizontal placement - -=item YPlaDevice - -Device table for device specific adjustment of vertical placement - -=item XAdvDevice - -Device table for device specific adjustment of horizontal advance - -=item YAdDevice - -Device table for device specific adjustment of vertical advance - -=item XIdPlacement - -Horizontal placement metric id (for Multiple Master fonts - but that's all I know!) - -=item YIdPlacement - -Vertical placement metric id - -=item XIdAdvance - -Horizontal advance metric id - -=item YIdAdvance - -Vertical advance metric id - -=back - -=head1 CORRESPONDANCE TO LAYOUT TYPES - -Here is what is stored in the ACTION_TYPE and MATCH_TYPE for each of the known -GPOS subtable types: - - 1.1 1.2 2.1 2.2 3 4 5 6 7.1 7.2 7.3 8.1 8.2 8.3 - ACTION_TYPE o v p p e a a a l l l l l l - MATCH_TYPE g c g c o g c o - - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Ttopen; -use Font::TTF::Delta; -use Font::TTF::Anchor; -use Font::TTF::Utils; -use vars qw(@ISA); - -@ISA = qw(Font::TTF::Ttopen); - - -=head2 read_sub - -Reads the subtable into the data structures - -=cut - -sub read_sub -{ - my ($self, $fh, $main_lookup, $sindex) = @_; - my ($type) = $main_lookup->{'TYPE'}; - my ($loc) = $fh->tell(); - my ($lookup) = $main_lookup->{'SUB'}[$sindex]; - my ($dat, $mcount, $scount, $i, $j, $count, $fmt, $fmt2, $cover, $srec, $subst); - my ($c1, $c2, $s, $moff, $boff); - - - if ($type == 8) - { - $fh->read($dat, 4); - ($fmt, $cover) = TTF_Unpack('S2', $dat); - if ($fmt < 3) - { - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - } - } else - { - $fh->read($dat, 6); - ($fmt, $cover, $count) = TTF_Unpack("S3", $dat); - } - unless ($fmt == 3 && ($type == 7 || $type == 8)) - { $lookup->{'COVERAGE'} = $self->read_cover($cover, $loc, $lookup, $fh, 1); } - - $lookup->{'FORMAT'} = $fmt; - if ($type == 1 && $fmt == 1) - { - $lookup->{'VFMT'} = $count; - $lookup->{'ADJUST'} = $self->read_value($count, $loc, $lookup, $fh); - $lookup->{'ACTION_TYPE'} = 'o'; - } elsif ($type == 1 && $fmt == 2) - { - $lookup->{'VFMT'} = $count; - $fh->read($dat, 2); - $mcount = unpack('n', $dat); - for ($i = 0; $i < $mcount; $i++) - { push (@{$lookup->{'RULES'}}, [{'ACTION' => - [$self->read_value($count, $loc, $lookup, $fh)]}]); } - $lookup->{'ACTION_TYPE'} = 'v'; - } elsif ($type == 2 && $fmt == 1) - { - $lookup->{'VFMT'} = $count; - $fh->read($dat, 4); - ($fmt2, $mcount) = unpack('n2', $dat); - $lookup->{'VFMT2'} = $fmt2; - $fh->read($dat, $mcount << 1); - foreach $s (unpack('n*', $dat)) - { - $fh->seek($loc + $s, 0); - $fh->read($dat, 2); - $scount = TTF_Unpack('S', $dat); - $subst = []; - for ($i = 0; $i < $scount; $i++) - { - $srec = {}; - $fh->read($dat, 2); - $srec->{'MATCH'} = [TTF_Unpack('S', $dat)]; - $srec->{'ACTION'} = [$self->read_value($count, $loc, $lookup, $fh), - $self->read_value($fmt2, $loc, $lookup, $fh)]; - push (@$subst, $srec); - } - push (@{$lookup->{'RULES'}}, $subst); - } - $lookup->{'ACTION_TYPE'} = 'p'; - $lookup->{'MATCH_TYPE'} = 'g'; - } elsif ($type == 2 && $fmt == 2) - { - $fh->read($dat, 10); - ($lookup->{'VFMT2'}, $c1, $c2, $mcount, $scount) = TTF_Unpack('S*', $dat); - $lookup->{'CLASS'} = $self->read_cover($c1, $loc, $lookup, $fh, 0); - $lookup->{'MATCH'} = [$self->read_cover($c2, $loc, $lookup, $fh, 0)]; - $lookup->{'VFMT'} = $count; - for ($i = 0; $i < $mcount; $i++) - { - $subst = []; - for ($j = 0; $j < $scount; $j++) - { - $srec = {}; - $srec->{'ACTION'} = [$self->read_value($lookup->{'VFMT'}, $loc, $lookup, $fh), - $self->read_value($lookup->{'VFMT2'}, $loc, $lookup, $fh)]; - push (@$subst, $srec); - } - push (@{$lookup->{'RULES'}}, $subst); - } - $lookup->{'ACTION_TYPE'} = 'p'; - $lookup->{'MATCH_TYPE'} = 'c'; - } elsif ($type == 3 && $fmt == 1) - { - $fh->read($dat, $count << 2); - for ($i = 0; $i < $count; $i++) - { push (@{$lookup->{'RULES'}}, [{'ACTION' => - [$self->read_anchor(TTF_Unpack('S', substr($dat, $i << 2, 2)), - $loc, $lookup, $fh), - $self->read_anchor(TTF_Unpack('S', substr($dat, ($i << 2) + 2, 2)), - $loc, $lookup, $fh)]}]); } - $lookup->{'ACTION_TYPE'} = 'e'; - } elsif ($type == 4 || $type == 5 || $type == 6) - { - my (@offs, $mloc, $thisloc, $ncomp, $k); - - $lookup->{'MATCH'} = [$lookup->{'COVERAGE'}]; - $lookup->{'COVERAGE'} = $self->read_cover($count, $loc, $lookup, $fh, 1); - $fh->read($dat, 6); - ($mcount, $moff, $boff) = TTF_Unpack('S*', $dat); - $fh->seek($loc + $moff, 0); - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - for ($i = 0; $i < $count; $i++) - { - $fh->read($dat, 4); - push (@{$lookup->{'MARKS'}}, [TTF_Unpack('S', $dat), - $self->read_anchor(TTF_Unpack('S', substr($dat, 2, 2)) + $moff, - $loc, $lookup, $fh)]); - } - $fh->seek($loc + $boff, 0); - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - $mloc = $fh->tell() - 2; - $thisloc = $mloc; - if ($type == 5) - { - $fh->read($dat, $count << 1); - @offs = TTF_Unpack('S*', $dat); - } - for ($i = 0; $i < $count; $i++) - { - if ($type == 5) - { - $thisloc = $mloc + $offs[$i]; - $fh->seek($thisloc, 0); - $fh->read($dat, 2); - $ncomp = TTF_Unpack('S', $dat); - } else - { $ncomp = 1; } - for ($j = 0; $j < $ncomp; $j++) - { - $subst = []; - $fh->read($dat, $mcount << 1); - for ($k = 0; $k < $mcount; $k++) - { push (@$subst, $self->read_anchor(TTF_Unpack('S', substr($dat, $k << 1, 2)) + $thisloc - $loc, - $loc, $lookup, $fh)); } - - push (@{$lookup->{'RULES'}[$i]}, {'ACTION' => $subst}); - } - } - $lookup->{'ACTION_TYPE'} = 'a'; - } elsif ($type == 7 || $type == 8) - { $self->read_context($lookup, $fh, $type - 2, $fmt, $cover, $count, $loc); } - $lookup; -} - - -=head2 $t->extension - -Returns the table type number for the extension table - -=cut - -sub extension -{ return 9; } - - -=head2 $t->out_sub - -Outputs the subtable to the given filehandle - -=cut - -sub out_sub -{ - my ($self, $fh, $main_lookup, $index, $ctables, $base) = @_; - my ($type) = $main_lookup->{'TYPE'}; - my ($lookup) = $main_lookup->{'SUB'}[$index]; - my ($fmt) = $lookup->{'FORMAT'}; - my ($out, $r, $s, $t, $i, $j, $vfmt, $vfmt2, $loc1); - my ($num) = $#{$lookup->{'RULES'}} + 1; - my ($mtables) = {}; - my (@reftables); - - if ($type == 1 && $fmt == 1) - { - $out = pack('n2', $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base)); - $vfmt = $self->fmt_value($lookup->{'ADJUST'}); - $out .= pack('n', $vfmt) . $self->out_value($lookup->{'ADJUST'}, $vfmt, $ctables, 6 + $base); - } elsif ($type == 1 && $fmt == 2) - { - $vfmt = 0; - foreach $r (@{$lookup->{'RULES'}}) - { $vfmt |= $self->fmt_value($r->[0]{'ACTION'}[0]); } - $out = pack('n4', $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $vfmt, $#{$lookup->{'RULES'}} + 1); - foreach $r (@{$lookup->{'RULES'}}) - { $out .= $self->out_value($r->[0]{'ACTION'}[0], $vfmt, $ctables, length($out) + $base); } - } elsif ($type == 2 && $fmt < 3) - { - $vfmt = 0; - $vfmt2 = 0; - foreach $r (@{$lookup->{'RULES'}}) - { - foreach $t (@$r) - { - $vfmt |= $self->fmt_value($t->{'ACTION'}[0]); - $vfmt2 |= $self->fmt_value($t->{'ACTION'}[1]); - } - } - if ($fmt == 1) - { - # start PairPosFormat1 subtable - $out = pack('n5', - $fmt, - Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $vfmt, - $vfmt2, - $#{$lookup->{'RULES'}} + 1); # PairSetCount - my $off = 0; - $off += length($out); - $off += 2 * ($#{$lookup->{'RULES'}} + 1); # there will be PairSetCount offsets here - my $pairsets = ''; - my (%cache); - foreach $r (@{$lookup->{'RULES'}}) # foreach PairSet table - { - # write offset to this PairSet at end of PairPosFormat1 table - if (defined $cache{"$r"}) - { $out .= pack('n', $cache{"$r"}); } - else - { - $out .= pack('n', $off); - $cache{"$r"} = $off; - - # generate PairSet itself (using $off as eventual offset within PairPos subtable) - my $pairset = pack('n', $#{$r} + 1); # PairValueCount - foreach $t (@$r) # foreach PairValueRecord - { - $pairset .= pack('n', $t->{'MATCH'}[0]); # SecondGlyph - MATCH has only one entry - $pairset .= - $self->out_value($t->{'ACTION'}[0], $vfmt, $ctables, $off + length($pairset) + $base); - $pairset .= - $self->out_value($t->{'ACTION'}[1], $vfmt2, $ctables, $off + length($pairset) + $base); - } - $off += length($pairset); - $pairsets .= $pairset; - } - } - $out .= $pairsets; - die "internal error: PairPos size not as calculated" if (length($out) != $off); - } else - { - $out = pack('n8', $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $vfmt, $vfmt2, - Font::TTF::Ttopen::ref_cache($lookup->{'CLASS'}, $ctables, 8 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'MATCH'}[0], $ctables, 10 + $base), - $lookup->{'CLASS'}{'max'} + 1, $lookup->{'MATCH'}[0]{'max'} + 1); - - for ($i = 0; $i <= $lookup->{'CLASS'}{'max'}; $i++) - { - for ($j = 0; $j <= $lookup->{'MATCH'}[0]{'max'}; $j++) - { - $out .= $self->out_value($lookup->{'RULES'}[$i][$j]{'ACTION'}[0], $vfmt, $ctables, length($out) + $base); - $out .= $self->out_value($lookup->{'RULES'}[$i][$j]{'ACTION'}[1], $vfmt2, $ctables, length($out) + $base); - } - } - } - } elsif ($type == 3 && $fmt == 1) - { - $out = pack('n3', $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $#{$lookup->{'RULES'}} + 1); - foreach $r (@{$lookup->{'RULES'}}) - { - $out .= pack('n2', Font::TTF::Ttopen::ref_cache($r->[0]{'ACTION'}[0], $ctables, length($out) + $base), - Font::TTF::Ttopen::ref_cache($r->[0]{'ACTION'}[1], $ctables, length($out) + 2 + $base)); - } - } elsif ($type == 4 || $type == 5 || $type == 6) - { - my ($loc_off, $loc_t, $ltables); - - $out = pack('n7', $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'MATCH'}[0], $ctables, 2 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 4 + $base), - $#{$lookup->{'RULES'}[0][0]{'ACTION'}} + 1, 12, ($#{$lookup->{'MARKS'}} + 4) << 2, - $#{$lookup->{'MARKS'}} + 1); - foreach $r (@{$lookup->{'MARKS'}}) - { $out .= pack('n2', $r->[0], Font::TTF::Ttopen::ref_cache($r->[1], $mtables, length($out) + 2)); } - push (@reftables, [$mtables, 12]); - - $loc_t = length($out); - substr($out, 10, 2) = pack('n', $loc_t); - $out .= pack('n', $#{$lookup->{'RULES'}} + 1); - if ($type == 5) - { - $loc1 = length($out); - $out .= pack('n*', (0) x ($#{$lookup->{'RULES'}} + 1)); - } - $ltables = {}; - for ($i = 0; $i <= $#{$lookup->{'RULES'}}; $i++) - { - if ($type == 5) - { - $ltables = {}; - $loc_t = length($out); - substr($out, $loc1 + ($i << 1), 2) = TTF_Pack('S', $loc_t - $loc1 + 2); - } - - $r = $lookup->{'RULES'}[$i]; - $out .= pack('n', $#{$r} + 1) if ($type == 5); - foreach $t (@$r) - { - foreach $s (@{$t->{'ACTION'}}) - { $out .= pack('n', Font::TTF::Ttopen::ref_cache($s, $ltables, length($out))); } - } - push (@reftables, [$ltables, $loc_t]) if ($type == 5); - } - push (@reftables, [$ltables, $loc_t]) unless ($type == 5); - $out = Font::TTF::Ttopen::out_final($fh, $out, \@reftables, 1); - } elsif ($type == 7 || $type == 8) - { $out = $self->out_context($lookup, $fh, $type - 2, $fmt, $ctables, $out, $num, $base); } -# push (@reftables, [$ctables, 0]); - $out; -} - - -=head2 $t->read_value($format, $base, $lookup, $fh) - -Reads a value record from the current location in the file, according to the -format given. - -=cut - -sub read_value -{ - my ($self, $fmt, $base, $lookup, $fh) = @_; - my ($flag) = 1; - my ($res) = {}; - my ($s, $i, $dat); - - $s = 0; - for ($i = 0; $i < 12; $i++) - { - $s++ if ($flag & $fmt); - $flag <<= 1; - } - - $fh->read($dat, $s << 1); - $flag = 1; $i = 0; - foreach $s (qw(XPlacement YPlacement XAdvance YAdvance)) - { - $res->{$s} = TTF_Unpack('s', substr($dat, $i++ << 1, 2)) if ($fmt & $flag); - $flag <<= 1; - } - - foreach $s (qw(XPlaDevice YPlaDevice XAdvDevice YAdvDevice)) - { - if ($fmt & $flag) - { $res->{$s} = $self->read_delta(TTF_Unpack('S', substr($i++ << 1, 2)), - $base, $lookup, $fh); } - $flag <<= 1; - } - - foreach $s (qw(XIdPlacement YIdPlacement XIdAdvance YIdAdvance)) - { - $res->{$s} = TTF_Unpack('S', substr($dat, $i++ << 1, 2)) if ($fmt & $flag); - $flag <<= 1; - } - $res; -} - - -=head2 $t->read_delta($offset, $base, $lookup, $fh) - -Reads a delta (device table) at the given offset if it hasn't already been read. -Store the offset and item in the lookup cache ($lookup->{' CACHE'}) - -=cut - -sub read_delta -{ - my ($self, $offset, $base, $lookup, $fh) = @_; - my ($loc) = $fh->tell(); - my ($res, $str); - - return undef unless $offset; - $str = sprintf("%X", $base + $offset); - return $lookup->{' CACHE'}{$str} if defined $lookup->{' CACHE'}{$str}; - $fh->seek($base + $offset, 0); - $res = Font::TTF::Delta->new->read($fh); - $fh->seek($loc, 0); - $lookup->{' CACHE'}{$str} = $res; - return $res; -} - - -=head2 $t->read_anchor($offset, $base, $lookup, $fh) - -Reads an Anchor table at the given offset if it hasn't already been read. - -=cut - -sub read_anchor -{ - my ($self, $offset, $base, $lookup, $fh) = @_; - my ($loc) = $fh->tell(); - my ($res, $str); - - return undef unless $offset; - $str = sprintf("%X", $base + $offset); - return $lookup->{' CACHE'}{$str} if defined $lookup->{' CACHE'}{$str}; - $fh->seek($base + $offset, 0); - $res = Font::TTF::Anchor->new->read($fh); - $fh->seek($loc, 0); - $lookup->{' CACHE'}{$str} = $res; - return $res; -} - - -=head2 $t->fmt_value - -Returns the value format for a given value record - -=cut - -sub fmt_value -{ - my ($self, $value) = @_; - my ($fmt) = 0; - my ($n); - - foreach $n (reverse qw(XPlacement YPlacement XAdvance YAdvance XPlaDevice YPlaDevice - XAdvDevice YAdvDevice XIdPlacement YIdPlacement XIdAdvance - YIdAdvance)) - { - $fmt <<= 1; - $fmt |= 1 if (defined $value->{$n} && (ref $value->{$n} || $value->{$n})); - } - $fmt; -} - - -=head2 $t->out_value - -Returns the output string for the outputting of the value for a given format. Also -updates the offset cache for any device tables referenced. - -=cut - -sub out_value -{ - my ($self, $value, $fmt, $tables, $offset) = @_; - my ($n, $flag, $out); - - $flag = 1; - foreach $n (qw(XPlacement YPlacement XAdvance YAdvance)) - { - $out .= pack('n', $value->{$n}) if ($flag & $fmt); - $flag <<= 1; - } - foreach $n (qw(XPlaDevice YPlaDevice XAdvDevice YAdvDevice)) - { - if ($flag & $fmt) - { - $out .= pack('n', Font::TTF::Ttopen::ref_cache( - $value->{$n}, $tables, $offset + length($out))); - } - $flag <<= 1; - } - foreach $n (qw(XIdPlacement YIdPlacement XIdAdvance YIdAdvance)) - { - $out .= pack('n', $value->{$n}) if ($flag & $fmt); - $flag <<= 1; - } - $out; -} - - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GSUB.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GSUB.pm deleted file mode 100644 index abf0f13..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GSUB.pm +++ /dev/null @@ -1,246 +0,0 @@ -package Font::TTF::GSUB; - -=head1 NAME - -Font::TTF::GSUB - Module support for the GSUB table in conjunction with TTOpen - -=head1 DESCRIPTION - -Handles the GSUB subtables in relation to Ttopen tables. Due to the variety of -different lookup types, the data structures are not all that straightforward, -although I have tried to make life easy for myself when using this! - -=head1 INSTANCE VARIABLES - -The structure of a GSUB table is the same as that given in L. -Here we give some of the semantics specific to GSUB lookups. - -=over 4 - -=item ACTION_TYPE - -This is a string taking one of 4 values indicating the nature of the information -in the ACTION array of the rule: - -=over 8 - -=item g - -The action contains a string of glyphs to replace the match string by - -=item l - -The action array contains a list of lookups and offsets to run, in order, on -the matched string - -=item a - -The action array is an unordered set of optional replacements for the matched -glyph. The application should make the selection somehow. - -=item o - -The action array is empty (in fact there is no rule array for this type of -rule) and the ADJUST value should be added to the glyph id to find the replacement -glyph id value - -=back - -=item MATCH_TYPE - -This indicates which type of information the various MATCH arrays (MATCH, PRE, -POST) hold in the rule: - -=over 8 - -=item g - -The array holds a string of glyph ids which should match exactly - -=item c - -The array holds a sequence of class definitions which each glyph should -correspondingly match to - -=item o - -The array holds offsets to coverage tables - -=back - -=back - -=head1 CORRESPONDANCE TO LAYOUT TYPES - -The following table gives the values for ACTION_TYPE and MATCH_TYPE for each -of the 11 different lookup types found in the GSUB table definition I have: - - 1.1 1.2 2 3 4 5.1 5.2 5.3 6.1 6.2 6.3 - ACTION_TYPE o g g a g l l l l l l - MATCH_TYPE g g c o g c o - -Hopefully, the rest of the uses of the variables should make sense from this -table. - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::Ttopen; - -@ISA = qw(Font::TTF::Ttopen); - -=head2 $t->read_sub($fh, $lookup, $index) - -Asked by the superclass to read in from the given file the indexth subtable from -lookup number lookup. The file is positioned ready for the read. - -=cut - -sub read_sub -{ - my ($self, $fh, $main_lookup, $sindex) = @_; - my ($type) = $main_lookup->{'TYPE'}; - my ($loc) = $fh->tell(); - my ($lookup) = $main_lookup->{'SUB'}[$sindex]; - my ($dat, $s, @subst, $t, $fmt, $cover, $count, $mcount, $scount, $i, $gid); - my (@srec); - - if ($type == 6) - { - $fh->read($dat, 4); - ($fmt, $cover) = TTF_Unpack('S2', $dat); - if ($fmt < 3) - { - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - } - } else - { - $fh->read($dat, 6); - ($fmt, $cover, $count) = TTF_Unpack("S3", $dat); - } - unless ($fmt == 3 && ($type == 5 || $type == 6)) - { $lookup->{'COVERAGE'} = $self->read_cover($cover, $loc, $lookup, $fh, 1); } - - $lookup->{'FORMAT'} = $fmt; - if ($type == 1 && $fmt == 1) - { - $count -= 65536 if ($count > 32767); - $lookup->{'ADJUST'} = $count; - $lookup->{'ACTION_TYPE'} = 'o'; - } elsif ($type == 1 && $fmt == 2) - { - $fh->read($dat, $count << 1); - @subst = TTF_Unpack('S*', $dat); - foreach $s (@subst) - { push(@{$lookup->{'RULES'}}, [{'ACTION' => [$s]}]); } - $lookup->{'ACTION_TYPE'} = 'g'; - } elsif ($type == 2 || $type == 3) - { - $fh->read($dat, $count << 1); # number of offsets - foreach $s (TTF_Unpack('S*', $dat)) - { - $fh->seek($loc + $s, 0); - $fh->read($dat, 2); - $t = TTF_Unpack('S', $dat); - $fh->read($dat, $t << 1); - push(@{$lookup->{'RULES'}}, [{'ACTION' => [TTF_Unpack('S*', $dat)]}]); - } - $lookup->{'ACTION_TYPE'} = ($type == 2 ? 'g' : 'a'); - } elsif ($type == 4) - { - $fh->read($dat, $count << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { - @subst = (); - $fh->seek($loc + $s, 0); - $fh->read($dat, 2); - $t = TTF_Unpack('S', $dat); - $fh->read($dat, $t << 1); - foreach $t (TTF_Unpack('S*', $dat)) - { - $fh->seek($loc + $s + $t, 0); - $fh->read($dat, 4); - ($gid, $mcount) = TTF_Unpack('S2', $dat); - $fh->read($dat, ($mcount - 1) << 1); - push(@subst, {'ACTION' => [$gid], 'MATCH' => [TTF_Unpack('S*', $dat)]}); - } - push(@{$lookup->{'RULES'}}, [@subst]); - } - $lookup->{'ACTION_TYPE'} = 'g'; - $lookup->{'MATCH_TYPE'} = 'g'; - } elsif ($type == 5 || $type == 6) - { $self->read_context($lookup, $fh, $type, $fmt, $cover, $count, $loc); } - $lookup; -} - - -=head2 $t->extension - -Returns the table type number for the extension table - -=cut - -sub extension -{ return 7; } - - -=head2 $t->out_sub($fh, $lookup, $index) - -Passed the filehandle to output to, suitably positioned, the lookup and subtable -index, this function outputs the subtable to $fh at that point. - -=cut - -sub out_sub -{ - my ($self, $fh, $main_lookup, $index, $ctables, $base) = @_; - my ($type) = $main_lookup->{'TYPE'}; - my ($lookup) = $main_lookup->{'SUB'}[$index]; - my ($fmt) = $lookup->{'FORMAT'}; - my ($out, $r, $t, $i, $j, $offc, $offd, $numd); - my ($num) = $#{$lookup->{'RULES'}} + 1; - - if ($type == 1) - { - $out = pack("nn", $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base)); - if ($fmt == 1) - { $out .= pack("n", $lookup->{'ADJUST'}); } - else - { - $out .= pack("n", $num); - foreach $r (@{$lookup->{'RULES'}}) - { $out .= pack("n", $r->[0]{'ACTION'}[0]); } - } - } elsif ($type == 2 || $type == 3) - { - $out = pack("nnn", $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $num); - $out .= pack('n*', (0) x $num); - $offc = length($out); - for ($i = 0; $i < $num; $i++) - { - $out .= pack("n*", $#{$lookup->{'RULES'}[$i][0]{'ACTION'}} + 1, - @{$lookup->{'RULES'}[$i][0]{'ACTION'}}); - substr($out, ($i << 1) + 6, 2) = pack('n', $offc); - $offc = length($out); - } - } elsif ($type == 4 || $type == 5 || $type == 6) - { $out = $self->out_context($lookup, $fh, $type, $fmt, $ctables, $out, $num, $base); } -# Font::TTF::Ttopen::out_final($fh, $out, [[$ctables, 0]]); - $out; -} - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyf.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyf.pm deleted file mode 100644 index e0268f3..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyf.pm +++ /dev/null @@ -1,158 +0,0 @@ -package Font::TTF::Glyf; - -=head1 NAME - -Font::TTF::Glyf - The Glyf data table - -=head1 DESCRIPTION - -This is a stub table. The real data is held in the loca table. If you want to get a glyf -look it up in the loca table as C<$f->{'loca'}{'glyphs'}[$num]>. It won't be here! - -The difference between reading this table as opposed to the loca table is that -reading this table will cause updated glyphs to be written out rather than just -copying the glyph information from the input file. This causes font writing to be -slower. So read the glyf as opposed to the loca table if you want to change glyf -data. Read the loca table only if you are just wanting to read the glyf information. - -This class is used when writing the glyphs though. - -=head1 METHODS - -=cut - - -use strict; -use vars qw(@ISA); -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the C table instead! - -=cut - -sub read -{ - my ($self) = @_; - - $self->{' PARENT'}{'loca'}->read; - $self->{' read'} = 1; - $self; -} - - -=head2 $t->out($fh) - -Writes out all the glyphs in the parent's location table, calculating a new -output location for each one. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($i, $loca, $offset, $numGlyphs); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $loca = $self->{' PARENT'}{'loca'}{'glyphs'}; - $numGlyphs = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - $offset = 0; - for ($i = 0; $i < $numGlyphs; $i++) - { - next unless defined $loca->[$i]; - $loca->[$i]->update; - $loca->[$i]{' OUTLOC'} = $offset; - $loca->[$i]->out($fh); - $offset += $loca->[$i]{' OUTLEN'}; - } - $self->{' PARENT'}{'head'}{'indexToLocFormat'} = ($offset >= 0x20000); - $self; -} - - -=head2 $t->out_xml($context, $depth) - -Outputs all the glyphs in the glyph table just where they are supposed to be output! - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - my ($loca, $i, $numGlyphs); - - $loca = $self->{' PARENT'}{'loca'}{'glyphs'}; - $numGlyphs = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - for ($i = 0; $i < $numGlyphs; $i++) - { - $context->{'gid'} = $i; - $loca->[$i]->out_xml($context, $depth) if (defined $loca->[$i]); - } - - $self; -} - - -=head2 $t->XML_start($context, $tag, %attrs) - -Pass control to glyphs as they occur - -=cut - -sub XML_start -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag eq 'glyph') - { - $context->{'tree'}[-1] = Font::TTF::Glyph->new(read => 2, PARENT => $self->{' PARENT'}); - $context->{'receiver'} = $context->{'tree'}[-1]; - } -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Collect up glyphs and put them into the loca table - -=cut - -sub XML_end -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag eq 'glyph') - { - unless (defined $context->{'glyphs'}) - { - if (defined $self->{' PARENT'}{'loca'}) - { $context->{'glyphs'} = $self->{' PARENT'}{'loca'}{'glyphs'}; } - else - { $context->{'glyphs'} = []; } - } - $context->{'glyphs'}[$attrs{'gid'}] = $context->{'tree'}[-1]; - return $context; - } else - { return $self->SUPER::XML_end(@_); } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyph.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyph.pm deleted file mode 100644 index 28233cf..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Glyph.pm +++ /dev/null @@ -1,847 +0,0 @@ -package Font::TTF::Glyph; - -=head1 NAME - -Font::TTF::Glyph - Holds a single glyph's information - -=head1 DESCRIPTION - -This is a single glyph description as held in a TT font. On creation only its -header is read. Thus you can get the bounding box of each glyph without having -to read all the other information. - -=head1 INSTANCE VARIABLES - -In addition to the named variables in a glyph header (C etc.), there are -also all capital instance variables for holding working information, mostly -from the location table. - -The standard attributes each glyph has are: - - numberOfContours - xMin - yMin - xMax - yMax - -There are also other, derived, instance variables for each glyph which are read -when the whole glyph is read (via C): - -=over 4 - -=item instLen - -Number of bytes in the hinting instructions (Warning this variable is deprecated, -use C{'hints'})> instead). - -=item hints - -The string containing the hinting code for the glyph - -=back - -In addition there are other attribute like instance variables for simple glyphs: - -=over 4 - -For each contour there is: - -=over 4 - -=item endPoints - -An array of endpoints for each contour in the glyph. There are -C contours in a glyph. The number of points in a glyph is -equal to the highest endpoint of a contour. - -=back - -There are also a number of arrays indexed by point number - -=over 4 - -=item flags - -The flags associated with reading this point. The flags for a point are -recalculated for a point when it is Cd. Thus the flags are not very -useful. The only important bit is bit 0 which indicates whether the point is -an 'on' curve point, or an 'off' curve point. - -=item x - -The absolute x co-ordinate of the point. - -=item y - -The absolute y co-ordinate of the point - -=back - -=back - -For composite glyphs there are other variables - -=over 4 - -=item metric - -This holds the component number (not its glyph number) of the component from -which the metrics for this glyph should be taken. - -=item comps - -This is an array of hashes for each component. Each hash has a number of -elements: - -=over 4 - -=item glyph - -The glyph number of the glyph which comprises this component of the composite. -NOTE: In some badly generated fonts, C may contain a numerical value -but that glyph might not actually exist in the font file. This could -occur in any glyph, but is particularly likely for glyphs that have -no strokes, such as SPACE, U+00A0 NO-BREAK SPACE, or -U+200B ZERO WIDTH SPACE. - -=item args - -An array of two arguments which may be an x, y co-ordinate or two attachment -points (one on the base glyph the other on the component). See flags for details. - -=item flag - -The flag for this component - -=item scale - -A 4 number array for component scaling. This allows stretching, rotating, etc. -Note that scaling applies to placement co-ordinates (rather than attachment points) -before locating rather than after. - -=back - -=item numPoints - -This is a generated value which contains the number of components read in for this -compound glyph. - -=back - -The private instance variables are: - -=over 4 - -=item INFILE (P) - -The input file form which to read any information - -=item LOC (P) - -Location relative to the start of the glyf table in the read file - -=item BASE (P) - -The location of the glyf table in the read file - -=item LEN (P) - -This is the number of bytes required by the glyph. It should be kept up to date -by calling the C method whenever any of the glyph content changes. - -=item OUTLOC (P) - -Location relative to the start of the glyf table. This variable is only active -whilst the output process is going on. It is used to inform the location table -where the glyph's location is, since the glyf table is output before the loca -table due to alphabetical ordering. - -=item OUTLEN (P) - -This indicates the length of the glyph data when it is output. This more -accurately reflects the internal memory form than the C variable which -only reflects the read file length. The C variable is only set after -calling C or C. - -=back - -=head2 Editing - -If you want to edit a glyph in some way, then you should read_dat the glyph, then -make your changes and then update the glyph or set the $g->{' isdirty'} variable. -It is the application's duty to ensure that the following instance variables are -correct, from which update will calculate the rest, including the bounding box -information. - - numPoints - numberOfContours - endPoints - x, y, flags (only flags bit 0) - instLen - hints - -For components, the numPoints, x, y, endPoints & flags are not required but -the following information is required for each component. - - flag (bits 2, 10, 11, 12) - glyph - args - scale - metric (glyph instance variable) - - -=head1 METHODS - -=cut - -use strict; -use vars qw(%fields @field_info); -use Font::TTF::Utils; -use Font::TTF::Table; - -@field_info = ( - 'numberOfContours' => 's', - 'xMin' => 's', - 'yMin' => 's', - 'xMax' => 's', - 'yMax' => 's'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head1 Font::TTF::Glyph->new(%parms) - -Creates a new glyph setting various instance variables - -=cut - -sub new -{ - my ($class, %parms) = @_; - my ($self) = {}; - my ($p); - - bless $self, $class; - foreach $p (keys %parms) - { $self->{" $p"} = $parms{$p}; } - init unless defined $fields{'xMin'}; - $self; -} - - -=head2 $g->read - -Reads the header component of the glyph (bounding box, etc.) and also the -glyph content, but into a data field rather than breaking it down into -its constituent structures. Use read_dat for this. - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($dat); - - return $self if $self->{' read'}; - $self->{' read'} = 1; - $fh->seek($self->{' LOC'} + $self->{' BASE'}, 0); - $fh->read($self->{' DAT'}, $self->{' LEN'}); - TTF_Read_Fields($self, $self->{' DAT'}, \%fields); - $self; -} - - -=head2 $g->read_dat - -Reads the contents of the glyph (components and curves, etc.) from the memory -store C into structures within the object. Then, to indicate where the -master form of the data is, it deletes the C instance variable. - -=cut - -sub read_dat -{ - my ($self) = @_; - my ($dat, $num, $max, $i, $flag, $len, $val, $val1, $fp); - - return $self if (defined $self->{' read'} && $self->{' read'} > 1); - $self->read unless $self->{' read'}; - $dat = $self->{' DAT'}; - $fp = 10; - $num = $self->{'numberOfContours'}; - if ($num > 0) - { - $self->{'endPoints'} = [unpack("n*", substr($dat, $fp, $num << 1))]; - $fp += $num << 1; - $max = 0; - foreach (@{$self->{'endPoints'}}) - { $max = $_ if $_ > $max; } -# print STDERR join(",", unpack('C*', $self->{" DAT"})); -# printf STDERR ("(%d,%d in %d=%d @ %d)", scalar @{$self->{'endPoints'}}, $max, length($dat), $self->{' LEN'}, $fp); - $max++ if (@{$self->{'endPoints'}}); - $self->{'numPoints'} = $max; - $self->{'instLen'} = unpack("n", substr($dat, $fp)); - $self->{'hints'} = substr($dat, $fp + 2, $self->{'instLen'}); - $fp += 2 + $self->{'instLen'}; -# read the flags array - for ($i = 0; $i < $max; $i++) - { - $flag = unpack("C", substr($dat, $fp++)); - $self->{'flags'}[$i] = $flag; - if ($flag & 8) - { - $len = unpack("C", substr($dat, $fp++)); - while ($len-- > 0) - { - $i++; - $self->{'flags'}[$i] = $flag; - } - } - } -#read the x array - for ($i = 0; $i < $max; $i++) - { - $flag = $self->{'flags'}[$i]; - if ($flag & 2) - { - $val = unpack("C", substr($dat, $fp++)); - $val = -$val unless ($flag & 16); - } elsif ($flag & 16) - { $val = 0; } - else - { - $val = TTF_Unpack("s", substr($dat, $fp)); - $fp += 2; - } - $self->{'x'}[$i] = $i == 0 ? $val : $self->{'x'}[$i - 1] + $val; - } -#read the y array - for ($i = 0; $i < $max; $i++) - { - $flag = $self->{'flags'}[$i]; - if ($flag & 4) - { - $val = unpack("C", substr($dat, $fp++)); - $val = -$val unless ($flag & 32); - } elsif ($flag & 32) - { $val = 0; } - else - { - $val = TTF_Unpack("s", substr($dat, $fp)); - $fp += 2; - } - $self->{'y'}[$i] = $i == 0 ? $val : $self->{'y'}[$i - 1] + $val; - } - } - -# compound glyph - elsif ($num < 0) - { - $flag = 1 << 5; # cheat to get the loop going - for ($i = 0; $flag & 32; $i++) - { - ($flag, $self->{'comps'}[$i]{'glyph'}) = unpack("n2", substr($dat, $fp)); - $fp += 4; - $self->{'comps'}[$i]{'flag'} = $flag; - if ($flag & 1) # ARGS1_AND_2_ARE_WORDS - { - $self->{'comps'}[$i]{'args'} = [TTF_Unpack("s2", substr($dat, $fp))]; - $fp += 4; - } else - { - $self->{'comps'}[$i]{'args'} = [unpack("c2", substr($dat, $fp))]; - $fp += 2; - } - - if ($flag & 8) - { - $val = TTF_Unpack("F", substr($dat, $fp)); - $fp += 2; - $self->{'comps'}[$i]{'scale'} = [$val, 0, 0, $val]; - } elsif ($flag & 64) - { - ($val, $val1) = TTF_Unpack("F2", substr($dat, $fp)); - $fp += 4; - $self->{'comps'}[$i]{'scale'} = [$val, 0, 0, $val1]; - } elsif ($flag & 128) - { - $self->{'comps'}[$i]{'scale'} = [TTF_Unpack("F4", substr($dat, $fp))]; - $fp += 8; - } - $self->{'metric'} = $i if ($flag & 512); - } - $self->{'numPoints'} = $i; - if ($flag & 256) # HAVE_INSTRUCTIONS - { - $self->{'instLen'} = unpack("n", substr($dat, $fp)); - $self->{'hints'} = substr($dat, $fp + 2, $self->{'instLen'}); - $fp += 2 + $self->{'instLen'}; - } - } - return undef if ($fp > length($dat)); - $self->{' read'} = 2; - $self; -} - - -=head2 $g->out($fh) - -Writes the glyph data to outfile - -=cut - -sub out -{ - my ($self, $fh) = @_; - - $self->read unless $self->{' read'}; - $self->update if $self->{' isDirty'}; - $fh->print($self->{' DAT'}); - $self->{' OUTLEN'} = length($self->{' DAT'}); - $self; -} - - -=head2 $g->out_xml($context, $depth) - -Outputs an XML description of the glyph - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($addr) = ($self =~ m/\((.+)\)$/o); - my ($k, $ndepth); - - if ($context->{'addresses'}{$addr}) - { - $context->{'fh'}->printf("%s\n", $depth, $context->{'gid'}, $addr); - return $self; - } - else - { - $context->{'fh'}->printf("%s\n", $depth, $context->{'gid'}, $addr); - } - - $ndepth = $depth . $context->{'indent'}; - $self->read_dat; - foreach $k (sort grep {$_ !~ m/^\s/o} keys %{$self}) - { - $self->XML_element($context, $ndepth, $k, $self->{$k}); - } - $context->{'fh'}->print("$depth\n"); - delete $context->{'done_points'}; - $self; -} - - -sub XML_element -{ - my ($self, $context, $depth, $key, $val) = @_; - my ($fh) = $context->{'fh'}; - my ($dind) = $depth . $context->{'indent'}; - my ($i); - - if ($self->{'numberOfContours'} >= 0 && ($key eq 'x' || $key eq 'y' || $key eq 'flags')) - { - return $self if ($context->{'done_points'}); - $context->{'done_points'} = 1; - - $fh->print("$depth\n"); - for ($i = 0; $i <= $#{$self->{'flags'}}; $i++) - { $fh->printf("%s\n", $dind, - $self->{'x'}[$i], $self->{'y'}[$i], $self->{'flags'}[$i]); } - $fh->print("$depth\n"); - } - elsif ($key eq 'hints') - { - my ($dat); - $fh->print("$depth\n"); -# Font::TTF::Utils::XML_hexdump($context, $depth . $context->{'indent'}, $self->{'hints'}); - $dat = Font::TTF::Utils::XML_binhint($self->{'hints'}) || ""; - $dat =~ s/\n(?!$)/\n$depth$context->{'indent'}/mg; - $fh->print("$depth$context->{'indent'}$dat"); - $fh->print("$depth\n"); - } - else - { return Font::TTF::Table::XML_element(@_); } - - $self; -} - - -=head2 $g->update - -Generates a C<$self->{'DAT'}> from the internal structures, if the data has -been read into structures in the first place. If you are building a glyph -from scratch you will need to set the instance variable C<' read'> to 2 (or -something > 1) for the update to work. - -=cut - -sub update -{ - my ($self) = @_; - my ($dat, $loc, $len, $flag, $x, $y, $i, $comp, $num); - - return $self unless (defined $self->{' read'} && $self->{' read'} > 1); - $self->update_bbox; - $self->{' DAT'} = TTF_Out_Fields($self, \%fields, 10); - $num = $self->{'numberOfContours'}; - if ($num > 0) - { - $self->{' DAT'} .= pack("n*", @{$self->{'endPoints'}}); - $len = $self->{'instLen'}; - $self->{' DAT'} .= pack("n", $len); - $self->{' DAT'} .= pack("a" . $len, substr($self->{'hints'}, 0, $len)) if ($len > 0); - for ($i = 0; $i < $self->{'numPoints'}; $i++) - { - $flag = $self->{'flags'}[$i] & 1; - if ($i == 0) - { - $x = $self->{'x'}[$i]; - $y = $self->{'y'}[$i]; - } else - { - $x = $self->{'x'}[$i] - $self->{'x'}[$i - 1]; - $y = $self->{'y'}[$i] - $self->{'y'}[$i - 1]; - } - $flag |= 16 if ($x == 0); - $flag |= 32 if ($y == 0); - if (($flag & 16) == 0 && $x < 256 && $x > -256) - { - $flag |= 2; - $flag |= 16 if ($x >= 0); - } - if (($flag & 32) == 0 && $y < 256 && $y > -256) - { - $flag |= 4; - $flag |= 32 if ($y >= 0); - } - $self->{' DAT'} .= pack("C", $flag); # sorry no repeats - $self->{'flags'}[$i] = $flag; - } - for ($i = 0; $i < $self->{'numPoints'}; $i++) - { - $flag = $self->{'flags'}[$i]; - $x = $self->{'x'}[$i] - (($i == 0) ? 0 : $self->{'x'}[$i - 1]); - if (($flag & 18) == 0) - { $self->{' DAT'} .= TTF_Pack("s", $x); } - elsif (($flag & 18) == 18) - { $self->{' DAT'} .= pack("C", $x); } - elsif (($flag & 18) == 2) - { $self->{' DAT'} .= pack("C", -$x); } - } - for ($i = 0; $i < $self->{'numPoints'}; $i++) - { - $flag = $self->{'flags'}[$i]; - $y = $self->{'y'}[$i] - (($i == 0) ? 0 : $self->{'y'}[$i - 1]); - if (($flag & 36) == 0) - { $self->{' DAT'} .= TTF_Pack("s", $y); } - elsif (($flag & 36) == 36) - { $self->{' DAT'} .= pack("C", $y); } - elsif (($flag & 36) == 4) - { $self->{' DAT'} .= pack("C", -$y); } - } - } - - elsif ($num < 0) - { - for ($i = 0; $i <= $#{$self->{'comps'}}; $i++) - { - $comp = $self->{'comps'}[$i]; - $flag = $comp->{'flag'} & 7158; # bits 2,10,11,12 - $flag |= 1 unless ($comp->{'args'}[0] > -129 && $comp->{'args'}[0] < 128 - && $comp->{'args'}[1] > -129 && $comp->{'args'}[1] < 128); - if (defined $comp->{'scale'}) - { - if ($comp->{'scale'}[1] == 0 && $comp->{'scale'}[2] == 0) - { - if ($comp->{'scale'}[0] == $comp->{'scale'}[3]) - { $flag |= 8 unless ($comp->{'scale'}[0] == 0 - || $comp->{'scale'}[0] == 1); } - else - { $flag |= 64; } - } else - { $flag |= 128; } - } - - $flag |= 512 if (defined $self->{'metric'} && $self->{'metric'} == $i); - if ($i == $#{$self->{'comps'}}) - { $flag |= 256 if (defined $self->{'instLen'} && $self->{'instLen'} > 0); } - else - { $flag |= 32; } - - $self->{' DAT'} .= pack("n", $flag); - $self->{' DAT'} .= pack("n", $comp->{'glyph'}); - $comp->{'flag'} = $flag; - - if ($flag & 1) - { $self->{' DAT'} .= TTF_Pack("s2", @{$comp->{'args'}}); } - else - { $self->{' DAT'} .= pack("CC", @{$comp->{'args'}}); } - - if ($flag & 8) - { $self->{' DAT'} .= TTF_Pack("F", $comp->{'scale'}[0]); } - elsif ($flag & 64) - { $self->{' DAT'} .= TTF_Pack("F2", $comp->{'scale'}[0], $comp->{'scale'}[3]); } - elsif ($flag & 128) - { $self->{' DAT'} .= TTF_Pack("F4", @{$comp->{'scale'}}); } - } - if (defined $self->{'instLen'} && $self->{'instLen'} > 0) - { - $len = $self->{'instLen'}; - $self->{' DAT'} .= pack("n", $len); - $self->{' DAT'} .= pack("a" . $len, substr($self->{'hints'}, 0, $len)); - } - } - my ($olen) = length($self->{' DAT'}); - $self->{' DAT'} .= ("\000") x (4 - ($olen & 3)) if ($olen & 3); - $self->{' OUTLEN'} = length($self->{' DAT'}); - $self->{' read'} = 2; # changed from 1 to 2 so we don't read_dat() again -# we leave numPoints and instLen since maxp stats use this - $self; -} - - -=head2 $g->update_bbox - -Updates the bounding box for this glyph according to the points in the glyph - -=cut - -sub update_bbox -{ - my ($self) = @_; - my ($num, $maxx, $minx, $maxy, $miny, $i, $comp, $x, $y, $compg); - - return $self unless $self->{' read'} > 1; # only if read_dat done - $miny = $minx = 65537; $maxx = $maxy = -65537; - $num = $self->{'numberOfContours'}; - if ($num > 0) - { - for ($i = 0; $i < $self->{'numPoints'}; $i++) - { - ($x, $y) = ($self->{'x'}[$i], $self->{'y'}[$i]); - - $maxx = $x if ($x > $maxx); - $minx = $x if ($x < $minx); - $maxy = $y if ($y > $maxy); - $miny = $y if ($y < $miny); - } - } - - elsif ($num < 0) - { - foreach $comp (@{$self->{'comps'}}) - { - my ($gnx, $gny, $gxx, $gxy); - my ($sxx, $sxy, $syx, $syy); - - my $otherg = $self->{' PARENT'}{'loca'}{'glyphs'}[$comp->{'glyph'}]; - # work around bad fonts: see documentation for 'comps' above - next unless (defined $otherg); - $compg = $otherg->read->update_bbox; - ($gnx, $gny, $gxx, $gxy) = @{$compg}{'xMin', 'yMin', 'xMax', 'yMax'}; - if (defined $comp->{'scale'}) - { - ($sxx, $sxy, $syx, $syy) = @{$comp->{'scale'}}; - ($gnx, $gny, $gxx, $gxy) = ($gnx*$sxx+$gny*$syx + $comp->{'args'}[0], - $gnx*$sxy+$gny*$syy + $comp->{'args'}[1], - $gxx*$sxx+$gxy*$syx + $comp->{'args'}[0], - $gxx*$sxy+$gxy*$syy + $comp->{'args'}[1]); - } elsif ($comp->{'args'}[0] || $comp->{'args'}[1]) - { - $gnx += $comp->{'args'}[0]; - $gny += $comp->{'args'}[1]; - $gxx += $comp->{'args'}[0]; - $gxy += $comp->{'args'}[1]; - } - ($gnx, $gxx) = ($gxx, $gnx) if $gnx > $gxx; - ($gny, $gxy) = ($gxy, $gny) if $gny > $gxy; - $maxx = $gxx if $gxx > $maxx; - $minx = $gnx if $gnx < $minx; - $maxy = $gxy if $gxy > $maxy; - $miny = $gny if $gny < $miny; - } - } - $self->{'xMax'} = $maxx; - $self->{'xMin'} = $minx; - $self->{'yMax'} = $maxy; - $self->{'yMin'} = $miny; - $self; -} - - -=head2 $g->maxInfo - -Returns lots of information about a glyph so that the C table can update -itself. Returns array containing contributions of this glyph to maxPoints, maxContours, -maxCompositePoints, maxCompositeContours, maxSizeOfInstructions, maxComponentElements, -and maxComponentDepth. - -=cut - -sub maxInfo -{ - my ($self) = @_; - my (@res, $i, @n); - - $self->read_dat; # make sure we've read some data - $res[4] = length($self->{'hints'}) if defined $self->{'hints'}; - $res[6] = 1; - if ($self->{'numberOfContours'} > 0) - { - $res[0] = $self->{'numPoints'}; - $res[1] = $self->{'numberOfContours'}; - } elsif ($self->{'numberOfContours'} < 0) - { - for ($i = 0; $i <= $#{$self->{'comps'}}; $i++) - { - my $otherg = - $self->{' PARENT'}{'loca'}{'glyphs'} - [$self->{'comps'}[$i]{'glyph'}]; - - # work around bad fonts: see documentation for 'comps' above - next unless (defined $otherg ); - - @n = $otherg->maxInfo; - - $res[2] += $n[2] == 0 ? $n[0] : $n[2]; - $res[3] += $n[3] == 0 ? $n[1] : $n[3]; - $res[5]++; - $res[6] = $n[6] + 1 if ($n[6] >= $res[6]); - } - } - @res; -} - -=head2 $g->empty - -Empties the glyph of all information to the level of not having been read. -Useful for saving memory in apps with many glyphs being read - -=cut - -sub empty -{ - my ($self) = @_; - my (%keep) = map {(" $_" => 1)} ('LOC', 'OUTLOC', 'PARENT', 'INFILE', 'BASE', - 'OUTLEN', 'LEN'); - map {delete $self->{$_} unless $keep{$_}} keys %$self; - - $self; -} - - -=head2 $g->get_points - -This method creates point information for a compound glyph. The information is -stored in the same place as if the glyph was not a compound, but since -numberOfContours is negative, the glyph is still marked as being a compound - -=cut - -sub get_points -{ - my ($self) = @_; - my ($comp, $compg, $nump, $e, $i); - - $self->read_dat; - return undef unless ($self->{'numberOfContours'} < 0); - - foreach $comp (@{$self->{'comps'}}) - { - $compg = $self->{' PARENT'}{'loca'}{'glyphs'}[$comp->{'glyph'}]; - # work around bad fonts: see documentation for 'comps' above - next unless (defined $compg ); - $compg->get_points; - - for ($i = 0; $i < $compg->{'numPoints'}; $i++) - { - my ($x, $y) = ($compg->{'x'}[$i], $compg->{'y'}[$i]); - if (defined $comp->{'scale'}) - { - ($x, $y) = ($x * $comp->{'scale'}[0] + $y * $comp->{'scale'}[2], - $x * $comp->{'scale'}[1] + $y * $comp->{'scale'}[3]); - } - if (defined $comp->{'args'}) - { ($x, $y) = ($x + $comp->{'args'}[0], $y + $comp->{'args'}[1]); } - push (@{$self->{'x'}}, $x); - push (@{$self->{'y'}}, $y); - push (@{$self->{'flags'}}, $compg->{'flags'}[$i]); - } - foreach $e (@{$compg->{'endPoints'}}) - { push (@{$self->{'endPoints'}}, $e + $nump); } - $nump += $compg->{'numPoints'}; - } - $self->{'numPoints'} = $nump; - $self; -} - - -=head2 $g->get_refs - -Returns an array of all the glyph ids that are used to make up this glyph. That -is all the compounds and their references and so on. If this glyph is not a -compound, then returns an empty array. - -Please note the warning about bad fonts that reference nonexistant glyphs -under INSTANCE VARIABLES above. This function will not attempt to -filter out nonexistant glyph numbers. - -=cut - -sub get_refs -{ - my ($self) = @_; - my (@res, $g); - - $self->read_dat; - return unless ($self->{'numberOfContours'} < 0); - foreach $g (@{$self->{'comps'}}) - { - push (@res, $g->{'glyph'}); - my $otherg = $self->{' PARENT'}{'loca'}{'glyphs'}[$g->{'glyph'}]; - # work around bad fonts: see documentation for 'comps' above - next unless (defined $otherg); - my @list = $otherg->get_refs; - push(@res, @list); - } - return @res; -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -The instance variables used here are somewhat clunky and inconsistent with -the other tables. - -=item * - -C doesn't re-calculate the bounding box or C. - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GrFeat.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GrFeat.pm deleted file mode 100644 index 2732a69..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/GrFeat.pm +++ /dev/null @@ -1,249 +0,0 @@ -package Font::TTF::GrFeat; - -=head1 NAME - -Font::TTF::GrFeat - Graphite Font Features - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=over 4 - -=item version - -=item features - -An array of hashes of the following form - -=over 8 - -=item feature - -feature id number - -=item name - -name index in name table - -=item exclusive - -exclusive flag - -=item default - -the default setting number - -=item settings - -hash of setting number against name string index - -=back - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); - -use Font::TTF::Utils; - -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the features from the TTF file into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($featureCount, $features); - - return $self if $self->{' read'}; - $self->SUPER::read_dat or return $self; - - ($self->{'version'}, $featureCount) = TTF_Unpack("vS", $self->{' dat'}); - - $features = []; - foreach (1 .. $featureCount) { - my ($feature, $nSettings, $settingTable, $featureFlags, $nameIndex, $reserved); - if ($self->{'version'} == 1) - { - ($feature, $nSettings, $settingTable, $featureFlags, $nameIndex) - = TTF_Unpack("SSLSS", substr($self->{' dat'}, $_ * 12, 12)); - #The version 1 Feat table ends with a feature (id 1) named NoName - #with zero settings but with an offset to the last entry in the setting - #array. This last setting has id 0 and an invalid name id. This last - #feature is changed to have one setting. - if ($_ == $featureCount && $nSettings == 0) {$nSettings = 1;} - } - else #version == 2 - {($feature, $nSettings, $reserved, $settingTable, $featureFlags, $nameIndex) - = TTF_Unpack("LSSLSS", substr($self->{' dat'}, 12 + ($_ - 1) * 16, 16))}; - my $feature = - { - 'feature' => $feature, - 'name' => $nameIndex, - }; - - #interpret the featureFlags & store settings - $feature->{'exclusive'} = (($featureFlags & 0x8000) != 0); - - my @settings = TTF_Unpack("S*", substr($self->{' dat'}, $settingTable, $nSettings * 4)); - if ($featureFlags & 0x4000) - {$feature->{'default'} = $featureFlags & 0x00FF;} - else - {$feature->{'default'} = @settings[0];} - $feature->{'settings'} = {@settings}; - - push(@$features, $feature); - } - - $self->{'features'} = $features; - - delete $self->{' dat'}; # no longer needed, and may become obsolete - $self->{' read'} = 1; - $self; -} - -=head2 $t->out($fh) - -Writes the features to a TTF file - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($features, $numFeatures, $settings, $featureFlags, $featuresData, $settingsData); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $features = $self->{'features'}; - $numFeatures = @$features; - $featuresData, $settingsData = ('', ''); - - foreach (@$features) { - $settings = $_->{'settings'}; - $featureFlags = ($_->{'exclusive'} ? 0x8000 : 0x0000); - -# output default setting first instead of using the featureFlags (as done below) -# $featureFlags = ($_->{'exclusive'} ? 0x8000 : 0x0000) | -# ($_->{'default'} != 0 ? 0x4000 | ($_->{'default'} & 0x00FF) -# : 0x0000); - if ($self->{'version'} == 1) - { - $featuresData .= TTF_Pack("SSLSS", - $_->{'feature'}, - scalar keys %$settings, - 12 + 12 * $numFeatures + length $settingsData, - $featureFlags, - $_->{'name'}); - } - else #version == 2 - { - $featuresData .= TTF_Pack("LSSLSS", - $_->{'feature'}, - scalar keys %$settings, - 0, - 12 + 16 * $numFeatures + length $settingsData, - $featureFlags, - $_->{'name'}); - } - - #output default setting first - #the settings may not be in their original order - my $defaultSetting = $_->{'default'}; - $settingsData .= TTF_Pack("SS", $defaultSetting, $settings->{$defaultSetting}); - foreach (sort {$a <=> $b} keys %$settings) { - if ($_ == $defaultSetting) {next;} #skip default setting - $settingsData .= TTF_Pack("SS", $_, $settings->{$_}); - } - } - - $fh->print(TTF_Pack("vSSL", $self->{'version'}, $numFeatures, 0, 0)); - $fh->print($featuresData); - $fh->print($settingsData); - - $self; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - my ($names, $features, $settings); - - $self->read; - - $names = $self->{' PARENT'}->{'name'}; - $names->read; - - $fh = 'STDOUT' unless defined $fh; - - $features = $self->{'features'}; - foreach (@$features) { - $fh->printf("Feature %d, %s, default: %d name %d # '%s'\n", - $_->{'feature'}, - ($_->{'exclusive'} ? "exclusive" : "additive"), - $_->{'default'}, - $_->{'name'}, - $names->{'strings'}[$_->{'name'}][3][1]{1033}); - $settings = $_->{'settings'}; - foreach (sort { $a <=> $b } keys %$settings) { - $fh->printf("\tSetting %d, name %d # '%s'\n", - $_, $settings->{$_}, $names->{'strings'}[$settings->{$_}][3][1]{1033}); - } - } - - $self; -} - -sub settingName -{ - my ($self, $feature, $setting) = @_; - - $self->read; - - my $names = $self->{' PARENT'}->{'name'}; - $names->read; - - my $features = $self->{'features'}; - my ($featureEntry) = grep { $_->{'feature'} == $feature } @$features; - my $featureName = $names->{'strings'}[$featureEntry->{'name'}][3][1]{1033}; - my $settingName = $featureEntry->{'exclusive'} - ? $names->{'strings'}[$featureEntry->{'settings'}->{$setting}][3][1]{1033} - : $names->{'strings'}[$featureEntry->{'settings'}->{$setting & ~1}][3][1]{1033} - . (($setting & 1) == 0 ? " On" : " Off"); - - ($featureName, $settingName); -} - -1; - -=head1 BUGS - -The version 1 Feat table ends with a feature (id 1) named NoName -with zero settings but with an offset to the last entry in the setting -array. This last setting has id 0 and an invalid name id. This last -feature is changed to have one setting. - -=head1 AUTHOR - -Alan Ward (derived from Jonathan Kew's Feat.pm). -See L for copyright and licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hdmx.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hdmx.pm deleted file mode 100644 index d1e47cb..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hdmx.pm +++ /dev/null @@ -1,149 +0,0 @@ -package Font::TTF::Hdmx; - -=head1 NAME - -Font::TTF::Hdmx - Horizontal device metrics - -=head1 DESCRIPTION - -The table consists of an hash of device metric tables indexed by the ppem for -that subtable. Each subtable consists of an array of advance widths in pixels -for each glyph at that ppem (horizontally). - -=head1 INSTANCE VARIABLES - -Individual metrics are accessed using the following referencing: - - $f->{'hdmx'}{$ppem}[$glyph_num] - -In addition there is one instance variable: - -=over 4 - -=item Num - -Number of device tables. - -=back - -=head2 METHODS - -=cut - -use strict; -use vars qw(@ISA); - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the table into data structures - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($numg, $ppem, $i, $numt, $dat, $len); - - $numg = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - $self->SUPER::read or return $self; - - $fh->read($dat, 8); - ($self->{'Version'}, $numt, $len) = unpack("nnN", $dat); - $self->{'Num'} = $numt; - - for ($i = 0; $i < $numt; $i++) - { - $fh->read($dat, $len); - $ppem = unpack("C", $dat); - $self->{$ppem} = [unpack("C$numg", substr($dat, 2))]; - } - $self; -} - - -=head2 $t->out($fh) - -Outputs the device metrics for this font - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($numg, $i, $pad, $len, $numt, @ppem, $max); - - return $self->SUPER::out($fh) unless ($self->{' read'}); - - $numg = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - @ppem = grep(/^\d+$/, sort {$a <=> $b} keys %$self); - $pad = "\000" x (3 - ($numg + 1) % 4); - $len = $numg + 2 + length($pad); - $fh->print(pack("nnN", 0, $#ppem + 1, $len)); - for $i (@ppem) - { - $max = 0; - foreach (@{$self->{$i}}[0..($numg - 1)]) - { $max = $_ if $_ > $max; } - $fh->print(pack("C*", $i, $max, @{$self->{$i}}[0..($numg - 1)]) . $pad); - } - $self; -} - - -=head2 $t->tables_do(&func) - -For each subtable it calls &sub($ref, $ppem) - -=cut - -sub tables_do -{ - my ($self, $func) = @_; - my ($i); - - foreach $i (grep(/^\d+$/, %$self)) - { &$func($self->{$i}, $i); } - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $value) - -Outputs device metrics a little more tidily - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $value) = @_; - my ($fh) = $context->{'fh'}; - my ($i); - - return $self->SUPER::XML_element(@_) if (ref($value) ne 'ARRAY'); - $fh->print("$depth\n"); - for ($i = 0; $i <= $#{$value}; $i += 25) - { - $fh->print("$depth$context->{'indent'}". join(' ', @{$value}[$i .. $i + 24]) . "\n"); - } - $fh->print("$depth\n"); - $self; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Head.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Head.pm deleted file mode 100644 index 362e8e4..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Head.pm +++ /dev/null @@ -1,250 +0,0 @@ -package Font::TTF::Head; - -=head1 NAME - -Font::TTF::Head - The head table for a TTF Font - -=head1 DESCRIPTION - -This is a very basic table with just instance variables as described in the -TTF documentation, using the same names. One of the most commonly used is -C. - -=head1 INSTANCE VARIABLES - -The C table has no internal instance variables beyond those common to all -tables and those specified in the standard: - - version - fontRevision - checkSumAdjustment - magicNumber - flags - unitsPerEm - created - modified - xMin - yMin - xMax - yMax - macStyle - lowestRecPPEM - fontDirectionHint - indexToLocFormat - glyphDataFormat - -The two dates are held as an array of two unsigned longs (32-bits) - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); - -require Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'version' => 'v', - 'fontRevision' => 'f', - 'checkSumAdjustment' => 'L', - 'magicNumber' => 'L', - 'flags' => 'S', - 'unitsPerEm' => 'S', - 'created' => 'L2', - 'modified' => 'L2', - 'xMin' => 's', - 'yMin' => 's', - 'xMax' => 's', - 'yMax' => 's', - 'macStyle' => 'S', - 'lowestRecPPEM' => 'S', - 'fontDirectionHint' => 's', - 'indexToLocFormat' => 's', - 'glyphDataFormat' => 's'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory thanks to some utility functions - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read || return $self; - - init unless defined $fields{'Ascender'}; - $self->{' INFILE'}->read($dat, 54); - - TTF_Read_Fields($self, $dat, \%fields); - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. If in memory -(which is usually) the checkSumAdjustment field is set to 0 as per the default -if the file checksum is not to be considered. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; # this is never true -# $self->{'checkSumAdjustment'} = 0 unless $self->{' PARENT'}{' wantsig'}; - $fh->print(TTF_Out_Fields($self, \%fields, 54)); - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $value) - -Handles date process for the XML exporter - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $value) = @_; - my ($fh) = $context->{'fh'}; - my ($output, @time); - my (@month) = qw(JAN FEB MAR APR MAY JUN JUL AUG SEP OCT NOV DEC); - - return $self->SUPER::XML_element(@_) unless ($key eq 'created' || $key eq 'modified'); - - @time = gmtime($self->getdate($key eq 'created')); - $output = sprintf("%d/%s/%d %d:%d:%d", $time[3], $month[$time[4]], $time[5] + 1900, - $time[2], $time[1], $time[0]); - $fh->print("$depth<$key>$output\n"); - $self; -} - - -=head2 $t->update - -Updates the head table based on the glyph data and the hmtx table - -=cut - -sub update -{ - my ($self) = @_; - my ($num, $i, $loc, $hmtx); - my ($xMin, $yMin, $xMax, $yMax, $lsbx); - - return undef unless ($self->SUPER::update); - - $num = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - return undef unless (defined $self->{' PARENT'}{'hmtx'} && defined $self->{' PARENT'}{'loca'}); - $hmtx = $self->{' PARENT'}{'hmtx'}->read; - - $self->{' PARENT'}{'loca'}->update; - $hmtx->update; # if we updated, then the flags will be set anyway. - $lsbx = 1; - for ($i = 0; $i < $num; $i++) - { - $loc = $self->{' PARENT'}{'loca'}{'glyphs'}[$i]; - next unless defined $loc; - $loc->read->update_bbox; - $xMin = $loc->{'xMin'} if ($loc->{'xMin'} < $xMin || $i == 0); - $yMin = $loc->{'yMin'} if ($loc->{'yMin'} < $yMin || $i == 0); - $xMax = $loc->{'xMax'} if ($loc->{'xMax'} > $xMax); - $yMax = $loc->{'yMax'} if ($loc->{'yMax'} > $yMax); - $lsbx &= ($loc->{'xMin'} == $hmtx->{'lsb'}[$i]); - } - $self->{'xMin'} = $xMin; - $self->{'yMin'} = $yMin; - $self->{'xMax'} = $xMax; - $self->{'yMax'} = $yMax; - if ($lsbx) - { $self->{'flags'} |= 2; } - else - { $self->{'flags'} &= ~2; } - $self; -} - - -=head2 $t->getdate($is_create) - -Converts font modification time (or creation time if $is_create is set) to a 32-bit integer as returned -from time(). Returns undef if the value is out of range, either before the epoch or after the maximum -storable time. - -=cut - -sub getdate -{ - my ($self, $is_create) = @_; - my ($arr) = $self->{$is_create ? 'created' : 'modified'}; - - $arr->[1] -= 2082844800; # seconds between 1/Jan/1904 and 1/Jan/1970 (midnight) - if ($arr->[1] < 0) - { - $arr->[1] += 0xFFFFFFF; $arr->[1]++; - $arr->[0]--; - } - return undef if $arr->[0] != 0; - return $arr->[1]; -} - - -=head2 $t->setdate($time, $is_create) - -Sets the time information for modification (or creation time if $is_create is set) according to the 32-bit -time information. - -=cut - -sub setdate -{ - my ($self, $time, $is_create) = @_; - my (@arr); - - $arr[1] = $time; - if ($arr[1] >= 0x83DA4F80) - { - $arr[1] -= 0xFFFFFFFF; - $arr[1]--; - $arr[0]++; - } - $arr[1] += 2082844800; - $self->{$is_create ? 'created' : 'modified'} = \@arr; - $self; -} - - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hhea.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hhea.pm deleted file mode 100644 index cb923b1..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hhea.pm +++ /dev/null @@ -1,159 +0,0 @@ -package Font::TTF::Hhea; - -=head1 NAME - -Font::TTF::Hhea - Horizontal Header table - -=head1 DESCRIPTION - -This is a simplte table with just standards specified instance variables - -=head1 INSTANCE VARIABLES - - version - Ascender - Descender - LineGap - advanceWidthMax - minLeftSideBearing - minRightSideBearing - xMaxExtent - caretSlopeRise - caretSlopeRun - metricDataFormat - numberOfHMetrics - - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); - -require Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'version' => 'v', - 'Ascender' => 's', - 'Descender' => 's', - 'LineGap' => 's', - 'advanceWidthMax' => 'S', - 'minLeftSideBearing' => 's', - 'minRightSideBearing' => 's', - 'xMaxExtent' => 's', - 'caretSlopeRise' => 's', - 'caretSlopeRun' => 's', - 'metricDataFormat' => '+10s', - 'numberOfHMetrics' => 'S'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory as instance variables - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read or return $self; - init unless defined $fields{'Ascender'}; - $self->{' INFILE'}->read($dat, 36); - - TTF_Read_Fields($self, $dat, \%fields); - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $self->{'numberOfHMetrics'} = $self->{' PARENT'}{'hmtx'}->numMetrics || $self->{'numberOfHMetrics'}; - $fh->print(TTF_Out_Fields($self, \%fields, 36)); - $self; -} - - -=head2 $t->update - -Updates various parameters in the hhea table from the hmtx table. - -=cut - -sub update -{ - my ($self) = @_; - my ($hmtx) = $self->{' PARENT'}{'hmtx'}; - my ($glyphs); - my ($num, $res); - my ($i, $maw, $mlsb, $mrsb, $mext, $aw, $lsb, $ext); - - return undef unless ($self->SUPER::update); - return undef unless (defined $hmtx && defined $self->{' PARENT'}{'loca'}); - - $hmtx->read->update; - $self->{' PARENT'}{'loca'}->read->update; - $glyphs = $self->{' PARENT'}{'loca'}{'glyphs'}; - $num = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - for ($i = 0; $i < $num; $i++) - { - $aw = $hmtx->{'advance'}[$i]; - $lsb = $hmtx->{'lsb'}[$i]; - if (defined $glyphs->[$i]) - { $ext = $lsb + $glyphs->[$i]->read->{'xMax'} - $glyphs->[$i]{'xMin'}; } - else - { $ext = $aw; } - $maw = $aw if ($aw > $maw); - $mlsb = $lsb if ($lsb < $mlsb or $i == 0); - $mrsb = $aw - $ext if ($aw - $ext < $mrsb or $i == 0); - $mext = $ext if ($ext > $mext); - } - $self->{'advanceWidthMax'} = $maw; - $self->{'minLeftSideBearing'} = $mlsb; - $self->{'minRightSideBearing'} = $mrsb; - $self->{'xMaxExtent'} = $mext; - $self->{'numberOfHMetrics'} = $hmtx->numMetrics; - $self; -} - - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hmtx.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hmtx.pm deleted file mode 100644 index 537df94..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Hmtx.pm +++ /dev/null @@ -1,214 +0,0 @@ -package Font::TTF::Hmtx; - -=head1 NAME - -Font::TTF::Hmtx - Horizontal Metrics - -=head1 DESCRIPTION - -Contains the advance width and left side bearing for each glyph. Given the -compressability of the data onto disk, this table uses information from -other tables, and thus must do part of its output during the output of -other tables - -=head1 INSTANCE VARIABLES - -The horizontal metrics are kept in two arrays by glyph id. The variable names -do not start with a space - -=over 4 - -=item advance - -An array containing the advance width for each glyph - -=item lsb - -An array containing the left side bearing for each glyph - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the horizontal metrics from the TTF file into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($numh, $numg); - - $numh = $self->{' PARENT'}{'hhea'}->read->{'numberOfHMetrics'}; - $numg = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - $self->_read($numg, $numh, "advance", "lsb"); -} - -sub _read -{ - my ($self, $numg, $numh, $tAdv, $tLsb) = @_; - my ($fh) = $self->{' INFILE'}; - my ($i, $dat); - - $self->SUPER::read or return $self; - - for ($i = 0; $i < $numh; $i++) - { - $fh->read($dat, 4); - ($self->{$tAdv}[$i], $self->{$tLsb}[$i]) = unpack("nn", $dat); - $self->{$tLsb}[$i] -= 65536 if ($self->{$tLsb}[$i] >= 32768); - } - - $i--; - while (++$i < $numg) - { - $fh->read($dat, 2); - $self->{$tAdv}[$i] = $self->{$tAdv}[$numh - 1]; - $self->{$tLsb}[$i] = unpack("n", $dat); - $self->{$tLsb}[$i] -= 65536 if ($self->{$tLsb}[$i] >= 32768); - } - $self; -} - -=head2 $t->numMetrics - -Calculates again the number of long metrics required to store the information -here. Returns undef if the table has not been read. - -=cut - -sub numMetrics -{ - my ($self) = @_; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($i); - - return undef unless $self->{' read'}; - - for ($i = $numg - 2; $i >= 0; $i--) - { last if ($self->{'advance'}[$i] != $self->{'advance'}[$i + 1]); } - - return $i + 2; -} - - -=head2 $t->out($fh) - -Writes the metrics to a TTF file. Assumes that the C has updated the -numHMetrics from here - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($numh) = $self->{' PARENT'}{'hhea'}->read->{'numberOfHMetrics'}; - $self->_out($fh, $numg, $numh, "advance", "lsb"); -} - -sub _out -{ - my ($self, $fh, $numg, $numh, $tAdv, $tLsb) = @_; - my ($i, $lsb); - - return $self->SUPER::out($fh) unless ($self->{' read'}); - - for ($i = 0; $i < $numg; $i++) - { - $lsb = $self->{$tLsb}[$i]; - $lsb += 65536 if $lsb < 0; - if ($i >= $numh) - { $fh->print(pack("n", $lsb)); } - else - { $fh->print(pack("n2", $self->{$tAdv}[$i], $lsb)); } - } - $self; -} - - -=head2 $t->update - -Updates the lsb values from the xMin from the each glyph - -=cut - -sub update -{ - my ($self) = @_; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($i); - - return undef unless ($self->SUPER::update); -# lsb & xMin must always be the same, regardless of any flags! -# return $self unless ($self->{' PARENT'}{'head'}{'flags'} & 2); # lsb & xMin the same - - $self->{' PARENT'}{'loca'}->update; - for ($i = 0; $i < $numg; $i++) - { - my ($g) = $self->{' PARENT'}{'loca'}{'glyphs'}[$i]; - if ($g) - { $self->{'lsb'}[$i] = $g->read->update_bbox->{'xMin'}; } - else - { $self->{'lsb'}[$i] = 0; } - } - $self->{' PARENT'}{'head'}{'flags'} |= 2; - $self; -} - - -=head2 $t->out_xml($context, $depth) - -Outputs the table in XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($addr) = ($self =~ m/\((.+)\)$/o); - my ($i); - - if ($context->{'addresses'}{$addr}) - { - $fh->printf("%s<%s id_ref='%s'/>\n", $depth, $context->{'name'}, $addr); - return $self; - } - else - { $fh->printf("%s<%s id='%s'>\n", $depth, $context->{'name'}, $addr); } - - $self->read; - - for ($i = 0; $i < $numg; $i++) - { $fh->print("$depth$context->{'indent'}\n"); } - - $fh->print("$depth{'name'}>\n"); - $self; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern.pm deleted file mode 100644 index 80f66d9..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern.pm +++ /dev/null @@ -1,296 +0,0 @@ -package Font::TTF::Kern; - -=head1 NAME - -Font::TTF::Kern - Kerning tables - -=head1 DESCRIPTION - -Kerning tables are held as an ordered collection of subtables each giving -incremental information regarding the kerning of various pairs of glyphs. - -The basic structure of the kerning data structure is: - - $kern = $f->{'kern'}{'tables'}[$tnum]{'kerns'}{$leftnum}{$rightnum}; - -Due to the possible complexity of some kerning tables the above information -is insufficient. Reference also needs to be made to the type of the table and -the coverage field. - -=head1 INSTANCE VARIABLES - -The instance variables for a kerning table are relatively straightforward. - -=over 4 - -=item Version - -Version number of the kerning table - -=item Num - -Number of subtables in the kerning table - -=item tables - -Array of subtables in the kerning table - -=over 4 - -Each subtable has a number of instance variables. - -=item kern - -A two level hash array containing kerning values. The indexing is left -value and then right value. In the case of type 2 tables, the indexing -is via left class and right class. It may seem using hashes is strange, -but most tables are not type 2 and this method saves empty array values. - -=item type - -Stores the table type. Only type 0 and type 2 tables are specified for -TrueType so far. - -=item coverage - -A bit field of coverage information regarding the kerning value. See the -TrueType specification for details. - -=item Version - -Contains the version number of the table. - -=item Num - -Number of kerning pairs in this type 0 table. - -=item left - -An array indexed by glyph - left_first which returns a class number for -the glyph in type 2 tables. - -=item right - -An array indexed by glyph - right_first which returns a class number for -the glyph in type 2 tables. - -=item left_first - -the glyph number of the first element in the left array for type 2 tables. - -=item right_first - -the glyph number of the first element in the right array for type 2 tables. - -=item num_left - -Number of left classes - -=item num_right - -Number of right classes - -=back - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the whole kerning table into structures - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($dat, $i, $numt, $len, $cov, $t); - - $self->SUPER::read or return $self; - - $fh->read($dat, 4); - ($self->{'Version'}, $numt) = unpack("n2", $dat); - $self->{'Num'} = $numt; - - for ($i = 0; $i < $numt; $i++) - { - $t = {}; - $fh->read($dat, 6); - ($t->{'Version'}, $len, $cov) = unpack("n3", $dat); - $t->{'coverage'} = $cov & 255; - $t->{'type'} = $cov >> 8; - $fh->read($dat, $len - 6); - if ($t->{'Version'} == 0) - { - $t->{'Num'} = unpack("n", $dat); - my (@vals) = unpack("n*", substr($dat, 8, $t->{'Num'} * 6)); - for (0 .. ($t->{'Num'} - 1)) - { - my ($f, $l, $v); - $f = shift @vals; - $l = shift @vals; - $v = shift @vals; - $v -= 65536 if ($v > 32767); - $t->{'kern'}{$f}{$l} = $v; - } - } elsif ($t->{'Version'} == 2) - { - my ($wid, $off, $numg, $maxl, $maxr, $j); - - $wid = unpack("n", $dat); - $off = unpack("n", substr($dat, 2)); - ($t->{'left_first'}, $numg) = unpack("n2", substr($dat, $off)); - $t->{'left'} = [unpack("C$numg", substr($dat, $off + 4))]; - foreach (@{$t->{'left'}}) - { - $_ /= $wid; - $maxl = $_ if ($_ > $maxl); - } - $t->{'left_max'} = $maxl; - - $off = unpack("n", substr($dat, 4)); - ($t->{'right_first'}, $numg) = unpack("n2", substr($dat, $off)); - $t->{'right'} = [unpack("C$numg", substr($dat, $off + 4))]; - foreach (@{$t->{'right'}}) - { - $_ >>= 1; - $maxr = $_ if ($_ > $maxr); - } - $t->{'right_max'} = $maxr; - - $off = unpack("n", substr($dat, 6)); - for ($j = 0; $j <= $maxl; $j++) - { - my ($k) = 0; - - map { $t->{'kern'}{$j}{$k} = $_ if $_; $k++; } - unpack("n$maxr", substr($dat, $off + $wid * $j)); - } - } - push (@{$self->{'tables'}}, $t); - } - $self; -} - - -=head2 $t->out($fh) - -Outputs the kerning tables to the given file - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($i, $l, $r, $loc, $loc1, $t); - - return $self->SUPER::out($fh) unless ($self->{' read'}); - - $fh->print(pack("n2", $self->{'Version'}, $self->{'Num'})); - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $t = $self->{'tables'}[$i]; - $loc = $fh->tell(); - - $fh->print(pack("nnn", $t->{'Version'}, 0, $t->{'coverage'})); - if ($t->{'Version'} == 0) - { - my ($dat); - foreach $l (sort {$a <=> $b} keys %{$t->{'kern'}}) - { - foreach $r (sort {$a <=> $b} keys %{$t->{'kern'}{$l}}) - { $dat .= TTF_Pack("SSs", $l, $r, $t->{'kern'}{$l}{$r}); } - } - $fh->print(TTF_Pack("SSSS", Font::TTF::Utils::TTF_bininfo(length($dat) / 6, 6))); - $fh->print($dat); - } elsif ($t->{'Version'} == 2) - { - my ($arr); - - $fh->print(pack("nnnn", $t->{'right_max'} << 1, 8, ($#{$t->{'left'}} + 7) << 1, - ($#{$t->{'left'}} + $#{$t->{'right'}} + 10) << 1)); - - $fh->print(pack("nn", $t->{'left_first'}, $#{$t->{'left'}} + 1)); - foreach (@{$t->{'left'}}) - { $fh->print(pack("C", $_ * (($t->{'left_max'} + 1) << 1))); } - - $fh->print(pack("nn", $t->{'right_first'}, $#{$t->{'right'}} + 1)); - foreach (@{$t->{'right'}}) - { $fh->print(pack("C", $_ << 1)); } - - $arr = "\000\000" x (($t->{'left_max'} + 1) * ($t->{'right_max'} + 1)); - foreach $l (keys %{$t->{'kern'}}) - { - foreach $r (keys %{$t->{'kern'}{$l}}) - { substr($arr, ($l * ($t->{'left_max'} + 1) + $r) << 1, 2) - = pack("n", $t->{'kern'}{$l}{$r}); } - } - $fh->print($arr); - } - $loc1 = $fh->tell(); - $fh->seek($loc + 2, 0); - $fh->print(pack("n", $loc1 - $loc)); - $fh->seek($loc1, 0); - } - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $value) - -Handles outputting the kern hash into XML a little more tidily - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $value) = @_; - my ($fh) = $context->{'fh'}; - my ($f, $l); - - return $self->SUPER::XML_element(@_) unless ($key eq 'kern'); - $fh->print("$depth\n"); - foreach $f (sort {$a <=> $b} keys %{$value}) - { - foreach $l (sort {$a <=> $b} keys %{$value->{$f}}) - { $fh->print("$depth$context->{'indent'}\n"); } - } - $fh->print("$depth\n"); - $self; -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -Only supports kerning table types 0 & 2. - -=item * - -No real support functions to I anything with the kerning tables yet. - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/ClassArray.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/ClassArray.pm deleted file mode 100644 index ddc630e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/ClassArray.pm +++ /dev/null @@ -1,153 +0,0 @@ -package Font::TTF::Kern::ClassArray; - -=head1 NAME - -Font::TTF::Kern::ClassArray - ClassArray Kern Subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -@ISA = qw(Font::TTF::Kern::Subtable); - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - - my $subtableStart = $fh->tell() - 8; - my $dat; - $fh->read($dat, 8); - my ($rowWidth, $leftClassTable, $rightClassTable, $array) = unpack("nnnn", $dat); - - $fh->seek($subtableStart + $leftClassTable, IO::File::SEEK_SET); - $fh->read($dat, 4); - my ($firstGlyph, $nGlyphs) = unpack("nn", $dat); - $fh->read($dat, $nGlyphs * 2); - my $leftClasses = []; - foreach (TTF_Unpack("S*", $dat)) { - push @{$leftClasses->[($_ - $array) / $rowWidth]}, $firstGlyph++; - } - - $fh->seek($subtableStart + $rightClassTable, IO::File::SEEK_SET); - $fh->read($dat, 4); - ($firstGlyph, $nGlyphs) = unpack("nn", $dat); - $fh->read($dat, $nGlyphs * 2); - my $rightClasses = []; - foreach (TTF_Unpack("S*", $dat)) { - push @{$rightClasses->[$_ / 2]}, $firstGlyph++; - } - - $fh->seek($subtableStart + $array, IO::File::SEEK_SET); - $fh->read($dat, $self->{'length'} - $array); - - my $offset = 0; - my $kernArray = []; - while ($offset < length($dat)) { - push @$kernArray, [ TTF_Unpack("s*", substr($dat, $offset, $rowWidth)) ]; - $offset += $rowWidth; - } - - $self->{'leftClasses'} = $leftClasses; - $self->{'rightClasses'} = $rightClasses; - $self->{'kernArray'} = $kernArray; - - $fh->seek($subtableStart + $self->{'length'}, IO::File::SEEK_SET); - - $self; -} - -=head2 $t->out_sub($fh) - -Writes the table to a file - -=cut - -sub out_sub -{ -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - -} - -sub dumpXML -{ - my ($self, $fh) = @_; - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - $fh->printf("\n"); - $self->dumpClasses($self->{'leftClasses'}, $fh); - $fh->printf("\n"); - - $fh->printf("\n"); - $self->dumpClasses($self->{'rightClasses'}, $fh); - $fh->printf("\n"); - - $fh->printf("\n"); - my $kernArray = $self->{'kernArray'}; - foreach (0 .. $#$kernArray) { - $fh->printf("\n", $_); - my $row = $kernArray->[$_]; - foreach (0 .. $#$row) { - $fh->printf("\n", $_, $row->[$_]); - } - $fh->printf("\n"); - } - $fh->printf("\n"); -} - -sub type -{ - return 'kernClassArray'; -} - - - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/CompactClassArray.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/CompactClassArray.pm deleted file mode 100644 index ab0304a..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/CompactClassArray.pm +++ /dev/null @@ -1,93 +0,0 @@ -package Font::TTF::Kern::CompactClassArray; - -=head1 NAME - -Font::TTF::Kern::CompactClassArray - Compact Class Array kern subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; - -@ISA = qw(Font::TTF::Kern::Subtable); - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - - die "incomplete"; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file - -=cut - -sub out_sub -{ - my ($self, $fh) = @_; - - die "incomplete"; - - $self; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - die "incomplete"; -} - - -sub type -{ - return 'kernCompactClassArray'; -} - - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/OrderedList.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/OrderedList.pm deleted file mode 100644 index 41cc8c1..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/OrderedList.pm +++ /dev/null @@ -1,108 +0,0 @@ -package Font::TTF::Kern::OrderedList; - -=head1 NAME - -Font::TTF::Kern::OrderedList - Ordered List Kern subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; - -@ISA = qw(Font::TTF::Kern::Subtable); - -sub new -{ - my ($class, @options) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - - my $dat; - $fh->read($dat, 8); - my ($nPairs, $searchRange, $entrySelector, $rangeShift) = unpack("nnnn", $dat); - - my $pairs = []; - foreach (1 .. $nPairs) { - $fh->read($dat, 6); - my ($left, $right, $kern) = TTF_Unpack("SSs", $dat); - push @$pairs, { 'left' => $left, 'right' => $right, 'kern' => $kern } if $kern != 0; - } - - $self->{'kernPairs'} = $pairs; - - $self; -} - -=head2 $t->out_sub($fh) - -Writes the table to a file - -=cut - -sub out_sub -{ - my ($self, $fh) = @_; - - my $pairs = $self->{'kernPairs'}; - $fh->print(pack("nnnn", TTF_bininfo(scalar @$pairs, 6))); - - foreach (sort { $a->{'left'} <=> $b->{'left'} or $a->{'right'} <=> $b->{'right'} } @$pairs) { - $fh->print(TTF_Pack("SSs", $_->{'left'}, $_->{'right'}, $_->{'kern'})); - } -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub dumpXML -{ - my ($self, $fh) = @_; - - my $postVal = $self->post()->{'VAL'}; - - $fh = 'STDOUT' unless defined $fh; - foreach (@{$self->{'kernPairs'}}) { - $fh->printf("\n", $postVal->[$_->{'left'}], $postVal->[$_->{'right'}], $_->{'kern'}); - } -} - - -sub type -{ - return 'kernOrderedList'; -} - - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/StateTable.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/StateTable.pm deleted file mode 100644 index 51d650a..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/StateTable.pm +++ /dev/null @@ -1,143 +0,0 @@ -package Font::TTF::Kern::StateTable; - -=head1 NAME - -Font::TTF::Kern::StateTable - State Table Kern subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Kern::Subtable; -use IO::File; - -@ISA = qw(Font::TTF::Kern::Subtable); - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my $stTableStart = $fh->tell(); - - my ($classes, $states, $entries) = AAT_read_state_table($fh, 0); - - foreach (@$entries) { - my $flags = $_->{'flags'}; - delete $_->{'flags'}; - $_->{'push'} = 1 if $flags & 0x8000; - $_->{'noAdvance'} = 1 if $flags & 0x4000; - $flags &= ~0xC000; - if ($flags != 0) { - my $kernList = []; - $fh->seek($stTableStart + $flags, IO::File::SEEK_SET); - while (1) { - $fh->read($dat, 2); - my $k = TTF_Unpack("s", $dat); - push @$kernList, ($k & ~1); - last if ($k & 1) != 0; - } - $_->{'kernList'} = $kernList; - } - } - - $self->{'classes'} = $classes; - $self->{'states'} = $states; - $self->{'entries'} = $entries; - - $fh->seek($stTableStart - 8 + $self->{'length'}, IO::File::SEEK_SET); - - $self; -} - -=head2 $t->out_sub($fh) - -Writes the table to a file - -=cut - -sub out_sub -{ -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ -} - -sub dumpXML -{ - my ($self, $fh) = @_; - - $fh->printf("\n"); - $self->dumpClasses($self->{'classes'}, $fh); - $fh->printf("\n"); - - $fh->printf("\n"); - my $states = $self->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\n", $_); - my $members = $states->[$_]; - foreach (0 .. $#$members) { - my $m = $members->[$_]; - $fh->printf("{'nextState'}); - $fh->printf(" push=\"1\"") if $m->{'push'}; - $fh->printf(" noAdvance=\"1\"") if $m->{'noAdvance'}; - if (exists $m->{'kernList'}) { - $fh->printf(">"); - foreach (@{$m->{'kernList'}}) { - $fh->printf("", $_); - } - $fh->printf("\n"); - } - else { - $fh->printf("/>\n"); - } - } - $fh->printf("\n"); - } - $fh->printf("\n"); -} - -sub type -{ - return 'kernStateTable'; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/Subtable.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/Subtable.pm deleted file mode 100644 index b1db410..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Kern/Subtable.pm +++ /dev/null @@ -1,175 +0,0 @@ -package Font::TTF::Kern::Subtable; - -=head1 NAME - -Font::TTF::Kern::Subtable - Kern Subtable superclass for AAT - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -require Font::TTF::Kern::OrderedList; -require Font::TTF::Kern::StateTable; -require Font::TTF::Kern::ClassArray; -require Font::TTF::Kern::CompactClassArray; - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - - bless $self, $class; -} - -sub create -{ - my ($class, $type, $coverage, $length) = @_; - - $class = ref($class) || $class; - - my $subclass; - if ($type == 0) { - $subclass = 'Font::TTF::Kern::OrderedList'; - } - elsif ($type == 1) { - $subclass = 'Font::TTF::Kern::StateTable'; - } - elsif ($type == 2) { - $subclass = 'Font::TTF::Kern::ClassArray'; - } - elsif ($type == 3) { - $subclass = 'Font::TTF::Kern::CompactClassArray'; - } - - my @options; - push @options,'vertical' if ($coverage & 0x8000) != 0; - push @options,'crossStream' if ($coverage & 0x4000) != 0; - push @options,'variation' if ($coverage & 0x2000) != 0; - - my ($subTable) = $subclass->new(@options); - - map { $subTable->{$_} = 1 } @options; - - $subTable->{'type'} = $type; - $subTable->{'length'} = $length; - - $subTable; -} - -=head2 $t->out($fh) - -Writes the table to a file - -=cut - -sub out -{ - my ($self, $fh) = @_; - - my $subtableStart = $fh->tell(); - my $type = $self->{'type'}; - my $coverage = $type; - $coverage += 0x8000 if $self->{'vertical'}; - $coverage += 0x4000 if $self->{'crossStream'}; - $coverage += 0x2000 if $self->{'variation'}; - - $fh->print(TTF_Pack("LSS", 0, $coverage, $self->{'tupleIndex'})); # placeholder for length - - $self->out_sub($fh); - - my $length = $fh->tell() - $subtableStart; - my $padBytes = (4 - ($length & 3)) & 3; - $fh->print(pack("C*", (0) x $padBytes)); - $length += $padBytes; - $fh->seek($subtableStart, IO::File::SEEK_SET); - $fh->print(pack("N", $length)); - $fh->seek($subtableStart + $length, IO::File::SEEK_SET); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub post -{ - my ($self) = @_; - - my $post = $self->{' PARENT'}{' PARENT'}{'post'}; - if (defined $post) { - $post->read; - } - else { - $post = {}; - } - - return $post; -} - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - $fh = 'STDOUT' unless defined $fh; -} - -=head2 $t->print_classes($fh) - -Prints a human-readable representation of the table - -=cut - -sub print_classes -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - my $classes = $self->{'classes'}; - foreach (0 .. $#$classes) { - my $class = $classes->[$_]; - if (defined $class) { - $fh->printf("\t\tClass %d:\t%s\n", $_, join(", ", map { $_ . " [" . $post->{'VAL'}[$_] . "]" } @$class)); - } - } -} - -sub dumpClasses -{ - my ($self, $classes, $fh) = @_; - my $post = $self->post(); - - foreach (0 .. $#$classes) { - my $c = $classes->[$_]; - if ($#$c > -1) { - $fh->printf("\n", $_); - foreach (@$c) { - $fh->printf("\n", $_, $post->{'VAL'}[$_]); - } - $fh->printf("\n"); - } - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/LTSH.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/LTSH.pm deleted file mode 100644 index 2b2dea6..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/LTSH.pm +++ /dev/null @@ -1,88 +0,0 @@ -package Font::TTF::LTSH; - -=head1 NAME - -Font::TTF::LTSH - Linear Threshold table - -=head1 DESCRIPTION - -Holds the linear threshold for each glyph. This is the ppem value at which a -glyph's metrics become linear. The value is set to 1 if a glyph's metrics are -always linear. - -=head1 INSTANCE VARIABLES - -=over 4 - -=item glyphs - -An array of ppem values. One value per glyph - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($numg, $dat); - - $self->SUPER::read or return $self; - - $fh->read($dat, 4); - ($self->{'Version'}, $numg) = unpack("nn", $dat); - $self->{'Num'} = $numg; - - $fh->read($dat, $numg); - $self->{'glyphs'} = [unpack("C$numg", $dat)]; - $self; -} - - -=head2 $t->out($fh) - -Outputs the LTSH to the given fh. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - return $self->SUPER::out($fh) unless ($self->{' read'}); - - $fh->print(pack("nn", 0, $numg)); - $fh->print(pack("C$numg", @{$self->{'glyphs'}})); - $self; -} - - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Loca.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Loca.pm deleted file mode 100644 index ca641bb..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Loca.pm +++ /dev/null @@ -1,183 +0,0 @@ -package Font::TTF::Loca; - -=head1 NAME - -Font::TTF::Loca - the Locations table, which is intimately tied to the glyf table - -=head1 DESCRIPTION - -The location table holds the directory of locations of each glyph within the -glyf table. Due to this relationship and the unimportance of the actual locations -when it comes to holding glyphs in memory, reading the location table results -in the creation of glyph objects for each glyph and stores them here. -So if you are looking for glyphs, don't look in the C table, look here -instead. - -Things get complicated if you try to change the glyph list within the one table. -The recommendation is to create another clean location object to replace this -table in the font, ensuring that the old table is read first and to transfer -or copy glyphs across from the read table to the new table. - -=head1 INSTANCE VARIABLES - -The instance variables do not start with a space - -=over 4 - -=item glyphs - -An array of glyph objects for each glyph. - -=item glyphtype - -A string containing the class name to create for each new glyph. If empty, -defaults to L. - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -@ISA = qw(Font::TTF::Table); - -require Font::TTF::Glyph; - - -=head2 $t->new - -Creates a new location table making sure it has a glyphs array - -=cut - -sub new -{ - my ($class) = shift; - my ($res) = $class->SUPER::new(@_); - $res->{'glyphs'} = []; - $res; -} - -=head2 $t->read - -Reads the location table creating glyph objects (L) for each glyph -allowing their later reading. - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($locFmt) = $self->{' PARENT'}{'head'}{'indexToLocFormat'}; - my ($numGlyphs) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($glyfLoc) = $self->{' PARENT'}{'glyf'}{' OFFSET'}; - my ($dat, $last, $i, $loc); - - $self->SUPER::read or return $self; - $fh->read($dat, $locFmt ? 4 : 2); - $last = unpack($locFmt ? "N" : "n", $dat); - for ($i = 0; $i < $numGlyphs; $i++) - { - $fh->read($dat, $locFmt ? 4 : 2); - $loc = unpack($locFmt ? "N" : "n", $dat); - $self->{'glyphs'}[$i] = ($self->{'glyphtype'} || "Font::TTF::Glyph")->new( - LOC => $last << ($locFmt ? 0 : 1), - OUTLOC => $last << ($locFmt ? 0 : 1), - PARENT => $self->{' PARENT'}, - INFILE => $fh, - BASE => $glyfLoc, - OUTLEN => ($loc - $last) << ($locFmt ? 0 : 1), - LEN => ($loc - $last) << ($locFmt ? 0 : 1)) if ($loc != $last); - $last = $loc; - } - $self; -} - - -=head2 $t->out($fh) - -Writes the location table out to $fh. Notice that not having read the location -table implies that the glyf table has not been read either, so the numbers in -the location table are still valid. Let's hope that C and -C haven't changed otherwise we are in big trouble. - -The function uses the OUTLOC location in the glyph calculated when the glyf -table was attempted to be output. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($locFmt) = $self->{' PARENT'}{'head'}{'indexToLocFormat'}; - my ($numGlyphs) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($count, $i, $offset, $g); - - return $self->SUPER::out($fh) unless ($self->{' read'}); - - $count = 0; - for ($i = 0; $i < $numGlyphs; $i++) - { - $g = ($self->{'glyphs'}[$i]) || ""; - unless ($g) - { - $count++; - next; - } else - { - if ($locFmt) - { $fh->print(pack("N", $g->{' OUTLOC'}) x ($count + 1)); } - else - { $fh->print(pack("n", $g->{' OUTLOC'} >> 1) x ($count + 1)); } - $count = 0; - $offset = $g->{' OUTLOC'} + $g->{' OUTLEN'}; - } - } - $fh->print(pack($locFmt ? "N" : "n", ($locFmt ? $offset: $offset >> 1)) x ($count + 1)); -} - - -=head2 $t->out_xml($context, $depth) - -No need to output a loca table, this is dynamically generated - -=cut - -sub out_xml -{ return $_[0]; } - - -=head2 $t->glyphs_do(&func) - -Calls func for each glyph in this location table in numerical order: - - &func($glyph, $glyph_num) - -=cut - -sub glyphs_do -{ - my ($self, $func) = @_; - my ($i); - - for ($i = 0; $i <= $#{$self->{'glyphs'}}; $i++) - { &$func($self->{'glyphs'}[$i], $i) if defined $self->{'glyphs'}[$i]; } - $self; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Manual.pod b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Manual.pod deleted file mode 100644 index c6d2938..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Manual.pod +++ /dev/null @@ -1,214 +0,0 @@ - -=head1 NAME - -Font::TTF::Manual - Information regarding the whole module set - -=head1 INTRODUCTION - -This document looks at the whole issue of how the various modules in the -TrueType Font work together. As such it is partly information on this font -system and partly information on TrueType fonts in general. - -Due to the inter-relation between so many tables in a TrueType font, different -tables will make expectations as to which other tables exist. At the very least -a font should consist of a C table and a C table. The system has -been designed around the expectation that the necessary tables for font -rendering in the Windows environment exist. But inter table dependencies have -been kept to what are considered necessary. - -This module set is not meant as a simple to use, mindless, font editing suite, -but as a low-level, get your hands dirty, know what you are doing, set of -classes for those who understand the intricacies (and there are many) of -TrueType fonts. To this end, if you get something wrong in the data structures, -etc. then this module set won't tell you and will happily create fonts which -don't work. - -At the time of writing, not every TrueType table in existence has been -implemented! Only the core basic tables of TrueType 1.0 (i.e. no embedded bitmap -tables, no postscript type tables, no OpenType tables and no GX tables) have -been implemented. If you want to help by implementing another table or two, then -please go ahead and send me your code. For a full list of tables, see -L. - - -=head2 Design Principles - -PERL is not C++. C++ encourages methods to be written for changing and reading -each instance variable in a class. If we did this in this PERL program the -results would be rather large and slow. Instead, since most access will be read -access, we expose as much of the inner storage of an object to user access -directly via hash lookup. The advantage this gives are great. For example, by -following an instance variable chain, looking up the C parameter for a -particular glyph becomes: - - $f->{'loca'}{'glyphs'}[$glyph]{'yMax'} - -Or, if we are feeling very lazy and don't mind waiting: - - $f->{'loca'}{'glyphs'}[$f->{'cmap'}->ms_lookup(0x41)]{'yMax'} - -The disadvantage of this method is that it behoves module users to behave -themselves. Thus it does not hold your hand and ensure that if you make a change -to a table, that the table is marked as I, or that other tables are -updated accordingly. - -It is up to the application developer to understand the implications of the -changes they make to a font, and to take the necessary action to ensure that the -data they get out is what they want. Thus, you could go and change the C -value on a glyph and output a new font with this change, but it is up to you to -ensure that the font's bounding box details in the C table are correct, -and even that your changing C is well motivated. - -To help with using the system, each module (or table) will not only describe the -methods it supports, which are relatively few, but also the instance variables -it supports, which are many. Most of the variables directly reflect table -attributes as specified in the OpenType specification, available from Microsoft -(L), Adobe and Apple. A list of the names -used is also given in each module, but not necessarily with any further -description. After all, this code is not a TrueType manual as well! - - -=head2 Conventions - -There are various conventions used in this system. - -Firstly we consider the documentation conventions regarding instance variables. -Each instance variable is marked indicating whether it is a B<(P)>rivate -variable which users of the module are not expected to read and certainly not -write to or a B<(R)>ead only variable which users may well want to read but not -write to. - - -=head1 METHODS - -This section examines various methods and how the various modules work with -these methods. - - -=head2 read and read_dat - -Before the data structures for a table can be accessed, they need to be filled -in from somewhere. The usual way to do this is to read an existing TrueType -font. This may be achieved by: - - $f = Font::TTF::Font->open($filename) || die "Unable to read $filename"; - -This will open an existing font and read its directory header. Notice that at -this point, none of the tables in the font have been read. (Actually, the -C and C tables are read at this point too since they contain the -commonly required parameters of): - - $f->{'head'}{'unitsPerEm'} - $f->{'maxp'}{'numGlyphs'} - -In order to be able to access information from a table, it is first necessary to -C it. Consider trying to find the advance width of a space character -(U+0020). The following code should do it: - - $f = Font::TTF::Font->open($ARGV[0]); - $snum = $f->{'cmap'}->ms_lookup(0x0020); - $sadv = $f->{'hmtx'}{'advance'}[$snum]; - print $sadv; - -This would result in the value zero being printed, which is far from correct. -But why? The first line would correctly read the font directory. The second line -would, incidently, correctly locate the space character in the Windows cmap -(assuming a non symbol encoded font). The third line would not succeed in its -task since the C table has not been filled in from the font file. To -achieve what we want we would first need to cause it to be read: - - $f->{'hmtx'}->read; - $sadv = $f->{'hmtx'}{'advance'}[$snum]; - -Or for those who are too lazy to write multiple lines, C returns the -object it reads. Thus we could write: - - $sadv = $f->{'hmtx'}->read->{'advance'}[$snum]; - -Why, if we always have to read tables before accessing information from them, -did we not have to do this for the C table? The answer lies in the method -call. It senses that the table hasn't been read and reads it for us. This will -generally happen with all method calls, it is only when we do direct data access -that we have to take the responsibility to read the table first. - -Reading a table does not necessarily result in all the data being placed into -internal data structures. In the case of a simple table C is sufficient. -In fact, the normal case is that C reads the data from the file into -an instance variable called C<' dat'> (including the space) and not into the -data structures. - -This is true except for the C class which represents a single glyph. Here -the process is reversed. Reading a C reads the data for the glyph into -the C<' dat'> instance variable and sets various header attributes for the glyph -(C, C, etc.). The data is converted out of the variable into -data structures via the C method. - -The aim, therefore, is that C should do the natural thing (read into data -structures for those tables and elements for which it is helpful -- all except -C at present) and C should do the unnatural thing: read just -the binary data for normal tables and convert binary data to data structures for -Cs. - -In summary, therefore, use C unless you want to hack around with the -internals of glyphs in which case see L for more details. - - -=head2 update - -The aim of this method is to allow the various data elements in a C font -to update themselves. All tables know how to update themselves. All tables also -contain information which cannot be I but is new knowledge in the font. -As a result, certain tables do nothing when they are updated. We can, therefore, -build an update hierarchy of tables, with the independent tables at the bottom -and C at the top: - - +--loca - | - glyf--+--maxp - | - +---+--head - | - hmtx------+--hhea - - cmap-----OS/2 - - name-- - - post-- - -There is an important universal dependency which it is up to the user to -keep up to date. This is C which is used to iterate over all -the glyphs. Note that the glyphs themselves are not held in the C table -but in the C table, so adding glyphs, etc. automatically involves keeping -the C table up to date. - -=head2 Creating fonts - -Suppose we were creating a font from scratch. How much information do we need -to supply and how much will C do for us? - -The following information is required: - - $f->{'loca'}{'glyphs'} - $f->{'head'}{'upem'} - $f->{'maxp'}{'numGlyphs'} (doesn't come from $f->{'loca'}{'glyphs'}) - $f->{'hmtx'}{'advance'} - $f->{'post'}['format'} - $f->{'post'}{'VAL'} - $f->{'cmap'} - $f->{'name'} - -Pretty much everything else is calculated for you. Details of what is needed -for a glyph may be found in L. Once we have all the -information we need (and there is lots more that you could add) then we simply - - $f->dirty; # mark all tables dirty - $f->update; # update the font - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Maxp.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Maxp.pm deleted file mode 100644 index e2d81b9..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Maxp.pm +++ /dev/null @@ -1,177 +0,0 @@ -package Font::TTF::Maxp; - -=head1 NAME - -Font::TTF::Maxp - Maximum Profile table in a font - -=head1 DESCRIPTION - -A collection of useful instance variables following the TTF standard. Probably -the most used being C. Note that this particular value is -foundational and should be kept up to date by the application, it is not updated -by C. - -Handles table versions 0.5, 1.0 - -=head1 INSTANCE VARIABLES - -No others beyond those specified in the standard: - - numGlyphs - maxPoints - maxContours - maxCompositePoints - maxCompositeContours - maxZones - maxTwilightPoints - maxStorage - maxFunctionDefs - maxInstructionDefs - maxStackElements - maxSizeOfInstructions - maxComponentElements - maxComponentDepth - - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'numGlyphs' => 'S', - 'maxPoints' => 'S', - 'maxContours' => 'S', - 'maxCompositePoints' => 'S', - 'maxCompositeContours' => 'S', - 'maxZones' => 'S', - 'maxTwilightPoints' => 'S', - 'maxStorage' => 'S', - 'maxFunctionDefs' => 'S', - 'maxInstructionDefs' => 'S', - 'maxStackElements' => 'S', - 'maxSizeOfInstructions' => 'S', - 'maxComponentElements' => 'S', - 'maxComponentDepth' => 'S'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read or return $self; - - init unless defined $fields{'numGlyphs'}; # any key would do - $self->{' INFILE'}->read($dat, 4); - $self->{'version'} = TTF_Unpack("v", $dat); - - if ($self->{'version'} == 0.5) - { - $self->{' INFILE'}->read($dat, 2); - $self->{'numGlyphs'} = unpack("n", $dat); - } else - { - $self->{' INFILE'}->read($dat, 28); - TTF_Read_Fields($self, $dat, \%fields); - } - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - $fh->print(TTF_Pack("v", $self->{'version'})); - - if ($self->{'version'} == 0.5) - { $fh->print(pack("n", $self->{'numGlyphs'})); } - else - { $fh->print(TTF_Out_Fields($self, \%fields, 28)); } - $self; -} - - -=head2 $t->update - -Calculates all the maximum values for a font based on the glyphs in the font. -Only those fields which require hinting code interpretation are ignored and -left as they were read. - -=cut - -sub update -{ - my ($self) = @_; - my ($i, $num, @n, @m, $j); - my (@name) = qw(maxPoints maxContours maxCompositePoints maxCompositeContours - maxSizeOfInstructions maxComponentElements maxComponentDepth); - - return undef unless ($self->SUPER::update); - return undef if ($self->{'version'} == 0.5); # only got numGlyphs - return undef unless (defined $self->{' PARENT'}{'loca'}); - $self->{' PARENT'}{'loca'}->update; - $num = $self->{'numGlyphs'}; - - for ($i = 0; $i < $num; $i++) - { - my ($g) = $self->{' PARENT'}{'loca'}{'glyphs'}[$i] || next; - - @n = $g->maxInfo; - - for ($j = 0; $j <= $#n; $j++) - { $m[$j] = $n[$j] if $n[$j] > $m[$j]; } - } - - foreach ('prep', 'fpgm') - { $m[4] = length($self->{' PARENT'}{$_}{' dat'}) - if (defined $self->{' PARENT'}{$_} - && length($self->{' PARENT'}{$_}{' dat'}) > $m[4]); - } - - for ($j = 0; $j <= $#name; $j++) - { $self->{$name[$j]} = $m[$j]; } - $self; -} -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort.pm deleted file mode 100644 index 6e954cb..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort.pm +++ /dev/null @@ -1,108 +0,0 @@ -package Font::TTF::Mort; - -=head1 NAME - -Font::TTF::Mort - Glyph Metamorphosis table in a font - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Mort::Chain; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $fh, $numChains); - - $self->SUPER::read or return $self; - - $fh = $self->{' INFILE'}; - - $fh->read($dat, 8); - ($self->{'version'}, $numChains) = TTF_Unpack("vL", $dat); - - my $chains = []; - foreach (1 .. $numChains) { - my $chain = new Font::TTF::Mort::Chain->new; - $chain->read($fh); - $chain->{' PARENT'} = $self; - push @$chains, $chain; - } - - $self->{'chains'} = $chains; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - my $chains = $self->{'chains'}; - $fh->print(TTF_Pack("vL", $self->{'version'}, scalar @$chains)); - - foreach (@$chains) { - $_->out($fh); - } -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - $self->read unless $self->{' read'}; - my $feat = $self->{' PARENT'}->{'feat'}; - $feat->read; - my $post = $self->{' PARENT'}->{'post'}; - $post->read; - - $fh = 'STDOUT' unless defined $fh; - - $fh->printf("version %f\n", $self->{'version'}); - - my $chains = $self->{'chains'}; - foreach (@$chains) { - $_->print($fh); - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm deleted file mode 100644 index b8e7b93..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Chain.pm +++ /dev/null @@ -1,196 +0,0 @@ -package Font::TTF::Mort::Chain; - -=head1 NAME - -Font::TTF::Mort::Chain - Chain Mort subtable for AAT - -=cut - -use strict; -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Mort::Subtable; -use IO::File; - -=head2 $t->new - -=cut - -sub new -{ - my ($class, %parms) = @_; - my ($self) = {}; - my ($p); - - $class = ref($class) || $class; - foreach $p (keys %parms) - { $self->{" $p"} = $parms{$p}; } - bless $self, $class; -} - -=head2 $t->read($fh) - -Reads the chain into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my $chainStart = $fh->tell(); - $fh->read($dat, 12); - my ($defaultFlags, $chainLength, $nFeatureEntries, $nSubtables) = TTF_Unpack("LLSS", $dat); - - my $featureEntries = []; - foreach (1 .. $nFeatureEntries) { - $fh->read($dat, 12); - my ($featureType, $featureSetting, $enableFlags, $disableFlags) = TTF_Unpack("SSLL", $dat); - push @$featureEntries, { - 'type' => $featureType, - 'setting' => $featureSetting, - 'enable' => $enableFlags, - 'disable' => $disableFlags - }; - } - - my $subtables = []; - foreach (1 .. $nSubtables) { - my $subtableStart = $fh->tell(); - - $fh->read($dat, 8); - my ($length, $coverage, $subFeatureFlags) = TTF_Unpack("SSL", $dat); - my $type = $coverage & 0x0007; - - my $subtable = Font::TTF::Mort::Subtable->create($type, $coverage, $subFeatureFlags, $length); - $subtable->read($fh); - $subtable->{' PARENT'} = $self; - - push @$subtables, $subtable; - $fh->seek($subtableStart + $length, IO::File::SEEK_SET); - } - - $self->{'defaultFlags'} = $defaultFlags; - $self->{'featureEntries'} = $featureEntries; - $self->{'subtables'} = $subtables; - - $fh->seek($chainStart + $chainLength, IO::File::SEEK_SET); - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - - my $chainStart = $fh->tell(); - my ($featureEntries, $subtables) = ($_->{'featureEntries'}, $_->{'subtables'}); - $fh->print(TTF_Pack("LLSS", $_->{'defaultFlags'}, 0, scalar @$featureEntries, scalar @$subtables)); # placeholder for length - - foreach (@$featureEntries) { - $fh->print(TTF_Pack("SSLL", $_->{'type'}, $_->{'setting'}, $_->{'enable'}, $_->{'disable'})); - } - - foreach (@$subtables) { - $_->out($fh); - } - - my $chainLength = $fh->tell() - $chainStart; - $fh->seek($chainStart + 4, IO::File::SEEK_SET); - $fh->print(pack("N", $chainLength)); - $fh->seek($chainStart + $chainLength, IO::File::SEEK_SET); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the chain - -=cut - -sub feat -{ - my ($self) = @_; - - my $feat = $self->{' PARENT'}{' PARENT'}{'feat'}; - if (defined $feat) { - $feat->read; - } - else { - $feat = {}; - } - - return $feat; -} - -sub print -{ - my ($self, $fh) = @_; - - $fh->printf("version %f\n", $self->{'version'}); - - my $defaultFlags = $self->{'defaultFlags'}; - $fh->printf("chain: defaultFlags = %08x\n", $defaultFlags); - - my $feat = $self->feat(); - my $featureEntries = $self->{'featureEntries'}; - foreach (@$featureEntries) { - $fh->printf("\tfeature %d, setting %d : enableFlags = %08x, disableFlags = %08x # '%s: %s'\n", - $_->{'type'}, $_->{'setting'}, $_->{'enable'}, $_->{'disable'}, - $feat->settingName($_->{'type'}, $_->{'setting'})); - } - - my $subtables = $self->{'subtables'}; - foreach (@$subtables) { - my $type = $_->{'type'}; - my $subFeatureFlags = $_->{'subFeatureFlags'}; - $fh->printf("\n\t%s table, %s, %s, subFeatureFlags = %08x # %s (%s)\n", - subtable_type_($type), $_->{'direction'}, $_->{'orientation'}, $subFeatureFlags, - "Default " . ((($subFeatureFlags & $defaultFlags) != 0) ? "On" : "Off"), - join(", ", - map { - join(": ", $feat->settingName($_->{'type'}, $_->{'setting'}) ) - } grep { ($_->{'enable'} & $subFeatureFlags) != 0 } @$featureEntries - ) ); - - $_->print($fh); - } -} - -sub subtable_type_ -{ - my ($val) = @_; - my ($res); - - my @types = ( - 'Rearrangement', - 'Contextual', - 'Ligature', - undef, - 'Non-contextual', - 'Insertion', - ); - $res = $types[$val] or ('Undefined (' . $val . ')'); - - $res; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Contextual.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Contextual.pm deleted file mode 100644 index fecc519..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Contextual.pm +++ /dev/null @@ -1,157 +0,0 @@ -package Font::TTF::Mort::Contextual; - -=head1 NAME - -Font::TTF::Mort::Contextual - Contextual Mort subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Mort::Subtable; -use IO::File; - -@ISA = qw(Font::TTF::AAT::Mort::Subtable); - -sub new -{ - my ($class, $direction, $orientation, $subFeatureFlags) = @_; - my ($self) = { - 'direction' => $direction, - 'orientation' => $orientation, - 'subFeatureFlags' => $subFeatureFlags - }; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 2); - - $fh->seek($stateTableStart, IO::File::SEEK_SET); - $fh->read($dat, 10); - my ($stateSize, $classTable, $stateArray, $entryTable, $mappingTables) = unpack("nnnnn", $dat); - my $limits = [$classTable, $stateArray, $entryTable, $mappingTables, $self->{'length'} - 8]; - - foreach (@$entries) { - my $actions = $_->{'actions'}; - foreach (@$actions) { - $_ = $_ ? $_ - ($mappingTables / 2) : undef; - } - } - - $self->{'classes'} = $classes; - $self->{'states'} = $states; - $self->{'mappings'} = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $mappingTables, $limits))]; - - $self; -} - -=head2 $t->pack_sub() - -=cut - -sub pack_sub -{ - my ($self) = @_; - - my ($dat) = pack("nnnnn", (0) x 5); # placeholders for stateSize, classTable, stateArray, entryTable, mappingTables - - my $classTable = length($dat); - my $classes = $self->{'classes'}; - $dat .= AAT_pack_classes($classes); - - my $stateArray = length($dat); - my $states = $self->{'states'}; - my ($dat1, $stateSize, $entries) = AAT_pack_states($classes, $stateArray, $states, - sub { - my $actions = $_->{'actions'}; - ( $_->{'flags'}, @$actions ) - } - ); - $dat .= $dat1; - - my $entryTable = length($dat); - my $offset = ($entryTable + 8 * @$entries) / 2; - foreach (@$entries) { - my ($nextState, $flags, @parts) = split /,/; - $dat .= pack("nnnn", $nextState, $flags, map { $_ eq "" ? 0 : $_ + $offset } @parts); - } - - my $mappingTables = length($dat); - my $mappings = $self->{'mappings'}; - $dat .= pack("n*", @$mappings); - - $dat1 = pack("nnnnn", $stateSize, $classTable, $stateArray, $entryTable, $mappingTables); - substr($dat, 0, length($dat1)) = $dat1; - - return $dat; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - $self->print_classes($fh); - - $fh->print("\n"); - my $states = $self->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - my $actions = $_->{'actions'}; - $fh->printf("\t(%s%d,%s,%s)", $flags, $_->{'nextState'}, map { defined $_ ? $_ : "=" } @$actions); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $mappings = $self->{'mappings'}; - foreach (0 .. $#$mappings) { - $fh->printf("\t\tMapping %d: %d [%s]\n", $_, $mappings->[$_], $post->{'VAL'}[$mappings->[$_]]); - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Insertion.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Insertion.pm deleted file mode 100644 index d10018b..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Insertion.pm +++ /dev/null @@ -1,179 +0,0 @@ -package Font::TTF::Mort::Insertion; - -=head1 NAME - -Font::TTF::Mort::Insertion - Insertion Mort subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -@ISA = qw(Font::TTF::Mort::Subtable); - -sub new -{ - my ($class, $direction, $orientation, $subFeatureFlags) = @_; - my ($self) = { - 'direction' => $direction, - 'orientation' => $orientation, - 'subFeatureFlags' => $subFeatureFlags - }; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my $subtableStart = $fh->tell(); - - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 2); - - my %insertListHash; - my $insertLists; - foreach (@$entries) { - my $flags = $_->{'flags'}; - my @insertCount = (($flags & 0x03e0) >> 5, ($flags & 0x001f)); - my $actions = $_->{'actions'}; - foreach (0 .. 1) { - if ($insertCount[$_] > 0) { - $fh->seek($stateTableStart + $actions->[$_], IO::File::SEEK_SET); - $fh->read($dat, $insertCount[$_] * 2); - if (not defined $insertListHash{$dat}) { - push @$insertLists, [unpack("n*", $dat)]; - $insertListHash{$dat} = $#$insertLists; - } - $actions->[$_] = $insertListHash{$dat}; - } - else { - $actions->[$_] = undef; - } - } - } - - $self->{'classes'} = $classes; - $self->{'states'} = $states; - $self->{'insertLists'} = $insertLists; - - $self; -} - -=head2 $t->pack_sub() - -=cut - -sub pack_sub -{ - my ($self) = @_; - - my ($dat) = pack("nnnn", (0) x 4); - - my $classTable = length($dat); - my $classes = $self->{'classes'}; - $dat .= AAT_pack_classes($classes); - - my $stateArray = length($dat); - my $states = $self->{'states'}; - my ($dat1, $stateSize, $entries) = AAT_pack_states($classes, $stateArray, $states, - sub { - my $actions = $_->{'actions'}; - ( $_->{'flags'}, @$actions ) - } - ); - $dat .= $dat1; - - my $entryTable = length($dat); - my $offset = ($entryTable + 8 * @$entries); - my @insListOffsets; - my $insertLists = $self->{'insertLists'}; - foreach (@$insertLists) { - push @insListOffsets, $offset; - $offset += 2 * scalar @$_; - } - foreach (@$entries) { - my ($nextState, $flags, @lists) = split /,/; - $flags &= ~0x03ff; - $flags |= (scalar @{$insertLists->[$lists[0]]}) << 5 if $lists[0] ne ''; - $flags |= (scalar @{$insertLists->[$lists[1]]}) if $lists[1] ne ''; - $dat .= pack("nnnn", $nextState, $flags, - map { $_ eq '' ? 0 : $insListOffsets[$_] } @lists); - } - - foreach (@$insertLists) { - $dat .= pack("n*", @$_); - } - - $dat1 = pack("nnnn", $stateSize, $classTable, $stateArray, $entryTable); - substr($dat, 0, length($dat1)) = $dat1; - - return $dat; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - $self->print_classes($fh); - - $fh->print("\n"); - my $states = $self->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - my $actions = $_->{'actions'}; - $fh->printf("\t(%s%d,%s,%s)", $flags, $_->{'nextState'}, map { defined $_ ? $_ : "=" } @$actions); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $insertLists = $self->{'insertLists'}; - foreach (0 .. $#$insertLists) { - my $insertList = $insertLists->[$_]; - $fh->printf("\t\tList %d: %s\n", $_, join(", ", map { $_ . " [" . $post->{'VAL'}[$_] . "]" } @$insertList)); - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Ligature.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Ligature.pm deleted file mode 100644 index c5cc912..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Ligature.pm +++ /dev/null @@ -1,246 +0,0 @@ -package Font::TTF::Mort::Ligature; - -=head1 NAME - -Font::TTF::Mort::Ligature - Ligature Mort subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -@ISA = qw(Font::TTF::Mort::Subtable); - -sub new -{ - my ($class, $direction, $orientation, $subFeatureFlags) = @_; - my ($self) = { - 'direction' => $direction, - 'orientation' => $orientation, - 'subFeatureFlags' => $subFeatureFlags - }; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 0); - - $fh->seek($stateTableStart, IO::File::SEEK_SET); - $fh->read($dat, 14); - my ($stateSize, $classTable, $stateArray, $entryTable, - $ligActionTable, $componentTable, $ligatureTable) = unpack("nnnnnnn", $dat); - my $limits = [$classTable, $stateArray, $entryTable, $ligActionTable, $componentTable, $ligatureTable, $self->{'length'} - 8]; - - my %actions; - my $actionLists; - foreach (@$entries) { - my $offset = $_->{'flags'} & 0x3fff; - $_->{'flags'} &= ~0x3fff; - if ($offset != 0) { - if (not defined $actions{$offset}) { - $fh->seek($stateTableStart + $offset, IO::File::SEEK_SET); - my $actionList; - while (1) { - $fh->read($dat, 4); - my $action = unpack("N", $dat); - my ($last, $store, $component) = (($action & 0x80000000) != 0, ($action & 0xC0000000) != 0, ($action & 0x3fffffff)); - $component -= 0x40000000 if $component > 0x1fffffff; - $component -= $componentTable / 2; - push @$actionList, { 'store' => $store, 'component' => $component }; - last if $last; - } - push @$actionLists, $actionList; - $actions{$offset} = $#$actionLists; - } - $_->{'actions'} = $actions{$offset}; - } - } - - $self->{'componentTable'} = $componentTable; - my $components = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $componentTable, $limits))]; - foreach (@$components) { - $_ = ($_ - $ligatureTable) . " +" if $_ >= $ligatureTable; - } - $self->{'components'} = $components; - - $self->{'ligatureTable'} = $ligatureTable; - $self->{'ligatures'} = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $ligatureTable, $limits))]; - - $self->{'classes'} = $classes; - $self->{'states'} = $states; - $self->{'actionLists'} = $actionLists; - - $self; -} - -=head2 $t->pack_sub($fh) - -=cut - -sub pack_sub -{ - my ($self) = @_; - my ($dat); - - $dat .= pack("nnnnnnn", (0) x 7); # placeholders for stateSize, classTable, stateArray, entryTable, actionLists, components, ligatures - - my $classTable = length($dat); - my $classes = $self->{'classes'}; - $dat .= AAT_pack_classes($classes); - - my $stateArray = length($dat); - my $states = $self->{'states'}; - - my ($dat1, $stateSize, $entries) = AAT_pack_states($classes, $stateArray, $states, - sub { - ( $_->{'flags'} & 0xc000, $_->{'actions'} ) - } - ); - $dat .= $dat1; - - my $actionLists = $self->{'actionLists'}; - my %actionListOffset; - my $actionListDataLength = 0; - my @actionListEntries; - foreach (0 .. $#$entries) { - my ($nextState, $flags, $offset) = split(/,/, $entries->[$_]); - if ($offset eq "") { - $offset = undef; - } - else { - if (defined $actionListOffset{$offset}) { - $offset = $actionListOffset{$offset}; - } - else { - $actionListOffset{$offset} = $actionListDataLength; - my $list = $actionLists->[$offset]; - $actionListDataLength += 4 * @$list; - push @actionListEntries, $list; - $offset = $actionListOffset{$offset}; - } - } - $entries->[$_] = [ $nextState, $flags, $offset ]; - } - my $entryTable = length($dat); - my $ligActionLists = ($entryTable + @$entries * 4 + 3) & ~3; - foreach (@$entries) { - $_->[2] += $ligActionLists if defined $_->[2]; - $dat .= pack("nn", $_->[0], $_->[1] + $_->[2]); - } - $dat .= pack("C*", (0) x ($ligActionLists - $entryTable - @$entries * 4)); - - die "internal error" unless length($dat) == $ligActionLists; - - my $componentTable = length($dat) + $actionListDataLength; - my $actionList; - foreach $actionList (@actionListEntries) { - foreach (0 .. $#$actionList) { - my $action = $actionList->[$_]; - my $val = $action->{'component'} + $componentTable / 2; - $val += 0x40000000 if $val < 0; - $val &= 0x3fffffff; - $val |= 0x40000000 if $action->{'store'}; - $val |= 0x80000000 if $_ == $#$actionList; - $dat .= pack("N", $val); - } - } - - die "internal error" unless length($dat) == $componentTable; - - my $components = $self->{'components'}; - my $ligatureTable = $componentTable + @$components * 2; - $dat .= pack("n*", map { (index($_, '+') >= 0 ? $ligatureTable : 0) + $_ } @$components); - - my $ligatures = $self->{'ligatures'}; - $dat .= pack("n*", @$ligatures); - - $dat1 = pack("nnnnnnn", $stateSize, $classTable, $stateArray, $entryTable, $ligActionLists, $componentTable, $ligatureTable); - substr($dat, 0, length($dat1)) = $dat1; - - return $dat; -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - $self->print_classes($fh); - - $fh->print("\n"); - my $states = $self->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - $fh->printf("\t(%s%d,%s)", $flags, $_->{'nextState'}, defined $_->{'actions'} ? $_->{'actions'} : "="); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $actionLists = $self->{'actionLists'}; - foreach (0 .. $#$actionLists) { - $fh->printf("\t\tList %d:\t", $_); - my $actionList = $actionLists->[$_]; - $fh->printf("%s\n", join(", ", map { ($_->{'component'} . ($_->{'store'} ? "*" : "") ) } @$actionList)); - } - - my $ligatureTable = $self->{'ligatureTable'}; - - $fh->print("\n"); - my $components = $self->{'components'}; - foreach (0 .. $#$components) { - $fh->printf("\t\tComponent %d: %s\n", $_, $components->[$_]); - } - - $fh->print("\n"); - my $ligatures = $self->{'ligatures'}; - foreach (0 .. $#$ligatures) { - $fh->printf("\t\tLigature %d: %d [%s]\n", $_, $ligatures->[$_], $post->{'VAL'}[$ligatures->[$_]]); - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Noncontextual.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Noncontextual.pm deleted file mode 100644 index 730982a..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Noncontextual.pm +++ /dev/null @@ -1,95 +0,0 @@ -package Font::TTF::Mort::Noncontextual; - -=head1 NAME - -Font::TTF::Mort::Noncontextual - Noncontextual Mort subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; - -@ISA = qw(Font::TTF::Mort::Subtable); - -sub new -{ - my ($class, $direction, $orientation, $subFeatureFlags) = @_; - my ($self) = { - 'direction' => $direction, - 'orientation' => $orientation, - 'subFeatureFlags' => $subFeatureFlags - }; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - my ($dat); - - my ($format, $lookup) = AAT_read_lookup($fh, 2, $self->{'length'} - 8, undef); - $self->{'format'} = $format; - $self->{'lookup'} = $lookup; - - $self; -} - -=head2 $t->pack_sub($fh) - -=cut - -sub pack_sub -{ - my ($self) = @_; - - return AAT_pack_lookup($self->{'format'}, $self->{'lookup'}, 2, undef); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - my $lookup = $self->{'lookup'}; - $fh->printf("\t\tLookup format %d\n", $self->{'format'}); - if (defined $lookup) { - foreach (sort { $a <=> $b } keys %$lookup) { - $fh->printf("\t\t\t%d [%s] -> %d [%s])\n", $_, $post->{'VAL'}[$_], $lookup->{$_}, $post->{'VAL'}[$lookup->{$_}]); - } - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Rearrangement.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Rearrangement.pm deleted file mode 100644 index 126144f..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Rearrangement.pm +++ /dev/null @@ -1,107 +0,0 @@ -package Font::TTF::Mort::Rearrangement; - -=head1 NAME - -Font::TTF::Mort::Rearrangement - Rearrangement Mort subtable for AAT - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; - -@ISA = qw(Font::TTF::Mort::Subtable); - -sub new -{ - my ($class, $direction, $orientation, $subFeatureFlags) = @_; - my ($self) = { - 'direction' => $direction, - 'orientation' => $orientation, - 'subFeatureFlags' => $subFeatureFlags - }; - - $class = ref($class) || $class; - bless $self, $class; -} - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self, $fh) = @_; - - my ($classes, $states) = AAT_read_state_table($fh, 0); - $self->{'classes'} = $classes; - $self->{'states'} = $states; - - $self; -} - -=head2 $t->pack_sub() - -=cut - -sub pack_sub -{ - my ($self) = @_; - - return AAT_pack_state_table($self->{'classes'}, $self->{'states'}, 0); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - my $post = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - $self->print_classes($fh); - - $fh->print("\n"); - my $states = $self->{'states'}; - my @verbs = ( "0", "Ax->xA", "xD->Dx", "AxD->DxA", - "ABx->xAB", "ABx->xBA", "xCD->CDx", "xCD->DCx", - "AxCD->CDxA", "AxCD->DCxA", "ABxD->DxAB", "ABxD->DxBA", - "ABxCD->CDxAB", "ABxCD->CDxBA", "ABxCD->DCxAB", "ABxCD->DCxBA"); - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "<" if ($_->{'flags'} & 0x8000); - $flags .= ">" if ($_->{'flags'} & 0x2000); - $fh->printf("\t(%s%d,%s)", $flags, $_->{'nextState'}, $verbs[($_->{'flags'} & 0x000f)]); - } - $fh->print("\n"); - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Subtable.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Subtable.pm deleted file mode 100644 index 4dd26e0..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Mort/Subtable.pm +++ /dev/null @@ -1,200 +0,0 @@ -package Font::TTF::Mort::Subtable; - -=head1 NAME - -Font::TTF::Mort::Subtable - Mort subtable superclass for AAT - -=head1 METHODS - -=cut - -use strict; -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -require Font::TTF::Mort::Rearrangement; -require Font::TTF::Mort::Contextual; -require Font::TTF::Mort::Ligature; -require Font::TTF::Mort::Noncontextual; -require Font::TTF::Mort::Insertion; - -sub new -{ - my ($class) = @_; - my ($self) = {}; - - $class = ref($class) || $class; - - bless $self, $class; -} - -sub create -{ - my ($class, $type, $coverage, $subFeatureFlags, $length) = @_; - - $class = ref($class) || $class; - - my $subclass; - if ($type == 0) { - $subclass = 'Font::TTF::Mort::Rearrangement'; - } - elsif ($type == 1) { - $subclass = 'Font::TTF::Mort::Contextual'; - } - elsif ($type == 2) { - $subclass = 'Font::TTF::Mort::Ligature'; - } - elsif ($type == 4) { - $subclass = 'Font::TTF::Mort::Noncontextual'; - } - elsif ($type == 5) { - $subclass = 'Font::TTF::Mort::Insertion'; - } - - my ($self) = $subclass->new( - (($coverage & 0x4000) ? 'RL' : 'LR'), - (($coverage & 0x2000) ? 'VH' : ($coverage & 0x8000) ? 'V' : 'H'), - $subFeatureFlags - ); - - $self->{'type'} = $type; - $self->{'length'} = $length; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file - -=cut - -sub out -{ - my ($self, $fh) = @_; - - my ($subtableStart) = $fh->tell(); - my ($type) = $self->{'type'}; - my ($coverage) = $type; - $coverage += 0x4000 if $self->{'direction'} eq 'RL'; - $coverage += 0x2000 if $self->{'orientation'} eq 'VH'; - $coverage += 0x8000 if $self->{'orientation'} eq 'V'; - - $fh->print(TTF_Pack("SSL", 0, $coverage, $self->{'subFeatureFlags'})); # placeholder for length - - my ($dat) = $self->pack_sub(); - $fh->print($dat); - - my ($length) = $fh->tell() - $subtableStart; - my ($padBytes) = (4 - ($length & 3)) & 3; - $fh->print(pack("C*", (0) x $padBytes)); - $length += $padBytes; - $fh->seek($subtableStart, IO::File::SEEK_SET); - $fh->print(pack("n", $length)); - $fh->seek($subtableStart + $length, IO::File::SEEK_SET); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub post -{ - my ($self) = @_; - - my ($post) = $self->{' PARENT'}{' PARENT'}{' PARENT'}{'post'}; - if (defined $post) { - $post->read; - } - else { - $post = {}; - } - - return $post; -} - -sub feat -{ - my ($self) = @_; - - return $self->{' PARENT'}->feat(); -} - -sub print -{ - my ($self, $fh) = @_; - - my ($feat) = $self->feat(); - my ($post) = $self->post(); - - $fh = 'STDOUT' unless defined $fh; - - my ($type) = $self->{'type'}; - my ($subFeatureFlags) = $self->{'subFeatureFlags'}; - my ($defaultFlags) = $self->{' PARENT'}{'defaultFlags'}; - my ($featureEntries) = $self->{' PARENT'}{'featureEntries'}; - $fh->printf("\n\t%s table, %s, %s, subFeatureFlags = %08x # %s (%s)\n", - subtable_type_($type), $_->{'direction'}, $_->{'orientation'}, $subFeatureFlags, - "Default " . ((($subFeatureFlags & $defaultFlags) != 0) ? "On" : "Off"), - join(", ", - map { - join(": ", $feat->settingName($_->{'type'}, $_->{'setting'}) ) - } grep { ($_->{'enable'} & $subFeatureFlags) != 0 } @$featureEntries - ) ); -} - -sub subtable_type_ -{ - my ($val) = @_; - my ($res); - - my (@types) = ( - 'Rearrangement', - 'Contextual', - 'Ligature', - undef, - 'Non-contextual', - 'Insertion', - ); - $res = $types[$val] or ('Undefined (' . $val . ')'); - - $res; -} - -=head2 $t->print_classes($fh) - -Prints a human-readable representation of the table - -=cut - -sub print_classes -{ - my ($self, $fh) = @_; - - my ($post) = $self->post(); - - my ($classes) = $self->{'classes'}; - foreach (0 .. $#$classes) { - my $class = $classes->[$_]; - if (defined $class) { - $fh->printf("\t\tClass %d:\t%s\n", $_, join(", ", map { $_ . " [" . $post->{'VAL'}[$_] . "]" } @$class)); - } - } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Name.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Name.pm deleted file mode 100644 index 144e926..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Name.pm +++ /dev/null @@ -1,782 +0,0 @@ -package Font::TTF::Name; - -=head1 NAME - -Font::TTF::Name - String table for a TTF font - -=head1 DESCRIPTION - -Strings are held by number, platform, encoding and language. Strings are -accessed as: - - $f->{'name'}{'strings'}[$number][$platform_id][$encoding_id]{$language_id} - -Notice that the language is held in an associative array due to its sparse -nature on some platforms such as Microsoft ($pid = 3). Notice also that the -array order is different from the stored array order (platform, encoding, -language, number) to allow for easy manipulation of strings by number (which is -what I guess most people will want to do). - -By default, C<$Font::TTF::Name::utf8> is set to 1, and strings will be stored as UTF8 wherever -possible. The method C can be used to find out if a string in a particular -platform and encoding will be returned as UTF8. Unicode strings are always -converted if utf8 is requested. Otherwise, strings are stored according to platform: - -You now have to set <$Font::TTF::Name::utf8> to 0 to get the old behaviour. - -=over 4 - -=item Apple Unicode (platform id = 0) - -Data is stored as network ordered UCS2. There is no encoding id for this platform -but there are language ids as per Mac language ids. - -=item Mac (platform id = 1) - -Data is stored as 8-bit binary data, leaving the interpretation to the user -according to encoding id. - -=item Unicode (platform id = 2) - -Currently stored as 16-bit network ordered UCS2. Upon release of Perl 5.005 this -will change to utf8 assuming current UCS2 semantics for all encoding ids. - -=item Windows (platform id = 3) - -As per Unicode, the data is currently stored as 16-bit network ordered UCS2. Upon -release of Perl 5.005 this will change to utf8 assuming current UCS2 semantics for -all encoding ids. - -=back - -=head1 INSTANCE VARIABLES - -=over 4 - -=item strings - -An array of arrays, etc. - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA $VERSION @apple_encs @apple_encodings $utf8 $cp_1252 @cp_1252 %win_langs %langs_win %langs_mac @ms_langids @mac_langs); -use Font::TTF::Table; -use Font::TTF::Utils; -@ISA = qw(Font::TTF::Table); - -$utf8 = 1; - -{ - my ($count, $i); - eval {require Compress::Zlib;}; - unless ($@) - { - for ($i = 0; $i <= $#apple_encs; $i++) - { - $apple_encodings[0][$i] = [unpack("n*", Compress::Zlib::uncompress(unpack("u", $apple_encs[$i])))] - if (defined $apple_encs[$i]); - foreach (0 .. 127) - { $apple_encodings[0][$i][$_] = $_; } - $count = 0; - $apple_encodings[1][$i] = {map {$_ => $count++} @{$apple_encodings[0][$i]}}; - } - $cp_1252[0] = [unpack("n*", Compress::Zlib::uncompress(unpack("u", $cp_1252)))]; - $count = 0; - $cp_1252[1] = {map({$_ => $count++} @{$cp_1252[0]})}; - } - for ($i = 0; $i < $#ms_langids; $i++) - { - if (defined $ms_langids[$i][1]) - { - my ($j); - for ($j = 0; $j < $#{$ms_langids[$i][1]}; $j++) - { - my ($v) = $ms_langids[$i][1][$j]; - if ($v =~ m/^-/o) - { $win_langs{(($j + 1) << 10) + $i} = $ms_langids[$i][0] . $v; } - else - { $win_langs{(($j + 1) << 10) + $i} = $v; } - } - } - else - { $win_langs{$i + 0x400} = $ms_langids[$i][0]; } - } - %langs_win = map {my ($t) = $win_langs{$_}; my (@res) = ($t => $_); push (@res, $t => $_) if ($t =~ s/-.*$//o && ($_ & 0xFC00) == 0x400); @res} keys %win_langs; - $i = 0; - %langs_mac = map {$_ => $i++} @mac_langs; -} - - -$VERSION = 1.1; # MJPH 17-JUN-2000 Add utf8 support -# $VERSION = 1.001; # MJPH 10-AUG-1998 Put $number first in list - -=head2 $t->read - -Reads all the names into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($dat, $num, $stroff, $i, $pid, $eid, $lid, $nid, $len, $off, $here); - - $self->SUPER::read or return $self; - $fh->read($dat, 6); - ($num, $stroff) = unpack("x2nn", $dat); - for ($i = 0; $i < $num; $i++) - { - use bytes; # hack to fix bugs in 5.8.7 - read($fh, $dat, 12); - ($pid, $eid, $lid, $nid, $len, $off) = unpack("n6", $dat); - $here = $fh->tell(); - $fh->seek($self->{' OFFSET'} + $stroff + $off, 0); - $fh->read($dat, $len); - if ($utf8) - { - if ($pid == 1 && defined $apple_encodings[0][$eid]) - { $dat = TTF_word_utf8(pack("n*", map({$apple_encodings[0][$eid][$_]} unpack("C*", $dat)))); } - elsif ($pid == 2 && $eid == 2 && @cp_1252) - { $dat = TTF_word_utf8(pack("n*", map({$cp_1252[0][$_]} unpack("C*", $dat)))); } - elsif ($pid == 0 || $pid == 3 || ($pid == 2 && $eid == 1)) - { $dat = TTF_word_utf8($dat); } - } - $self->{'strings'}[$nid][$pid][$eid]{$lid} = $dat; - $fh->seek($here, 0); - } - $self; -} - - -=head2 $t->out($fh) - -Writes out all the strings - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($pid, $eid, $lid, $nid, $todo, @todo); - my ($len, $offset, $loc, $stroff, $endloc, $str_trans); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $loc = $fh->tell(); - $fh->print(pack("n3", 0, 0, 0)); - foreach $nid (0 .. $#{$self->{'strings'}}) - { - foreach $pid (0 .. $#{$self->{'strings'}[$nid]}) - { - foreach $eid (0 .. $#{$self->{'strings'}[$nid][$pid]}) - { - foreach $lid (sort keys %{$self->{'strings'}[$nid][$pid][$eid]}) - { - $str_trans = $self->{'strings'}[$nid][$pid][$eid]{$lid}; - if ($utf8) - { - if ($pid == 1 && defined $apple_encodings[1][$eid]) - { $str_trans = pack("C*", - map({$apple_encodings[1][$eid]{$_} || 0x3F} unpack("n*", - TTF_utf8_word($str_trans)))); } - elsif ($pid == 2 && $eid == 2 && @cp_1252) - { $str_trans = pack("C*", - map({$cp_1252[1][$eid]{$_} || 0x3F} unpack("n*", - TTF_utf8_word($str_trans)))); } - elsif ($pid == 2 && $eid == 0) - { $str_trans =~ s/[\xc0-\xff][\x80-\xbf]+/?/og; } - elsif ($pid == 0 || $pid == 3 || ($pid == 2 && $eid == 1)) - { $str_trans = TTF_utf8_word($str_trans); } - } - push (@todo, [$pid, $eid, $lid, $nid, $str_trans]); - } - } - } - } - - $offset = 0; - @todo = (sort {$a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] || $a->[2] <=> $b->[2] - || $a->[3] <=> $b->[3]} @todo); - foreach $todo (@todo) - { - $len = length($todo->[4]); - $fh->print(pack("n6", @{$todo}[0..3], $len, $offset)); - $offset += $len; - } - - $stroff = $fh->tell() - $loc; - foreach $todo (@todo) - { $fh->print($todo->[4]); } - - $endloc = $fh->tell(); - $fh->seek($loc, 0); - $fh->print(pack("n3", 0, $#todo + 1, $stroff)); - $fh->seek($endloc, 0); - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $value) - -Outputs the string element in nice XML (which is all the table really!) - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $value) = @_; - my ($fh) = $context->{'fh'}; - my ($nid, $pid, $eid, $lid); - - return $self->SUPER::XML_element(@_) unless ($key eq 'strings'); - - foreach $nid (0 .. $#{$self->{'strings'}}) - { - next unless ref($self->{'strings'}[$nid]); -# $fh->print("$depth\n"); - foreach $pid (0 .. $#{$self->{'strings'}[$nid]}) - { - foreach $eid (0 .. $#{$self->{'strings'}[$nid][$pid]}) - { - foreach $lid (sort {$a <=> $b} keys %{$self->{'strings'}[$nid][$pid][$eid]}) - { - my ($lang) = $self->get_lang($pid, $lid) || $lid; - $fh->printf("%s\n%s%s%s\n%s\n", - $depth, $nid, $pid, $eid, $lang, $depth, - $context->{'indent'}, $self->{'strings'}[$nid][$pid][$eid]{$lid}, $depth); - } - } - } -# $fh->print("$depth\n"); - } - $self; -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Store strings in the right place - -=cut - -sub XML_end -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag eq 'string') - { - my ($lid) = $self->find_name($attrs{'platform'}, $attrs{'language'}) || $attrs{'language'}; - $self->{'strings'}[$attrs{'id'}][$attrs{'platform'}][$attrs{'encoding'}]{$lid} - = $context->{'text'}; - return $context; - } - else - { return $self->SUPER::XML_end(@_); } -} - -=head2 is_utf8($pid, $eid) - -Returns whether a string of a given platform and encoding is going to be in UTF8 - -=cut - -sub is_utf8 -{ - my ($self, $pid, $eid) = @_; - - return ($utf8 && ($pid == 0 || $pid == 3 || ($pid == 2 && ($eid != 2 || @cp_1252)) - || ($pid == 1 && defined $apple_encodings[$eid]))); -} - - -=head2 find_name($nid) - -Hunts down a name in all the standard places and returns the string and for an -array context the pid, eid & lid as well - -=cut - -sub find_name -{ - my ($self, $nid) = @_; - my ($res, $pid, $eid, $lid, $look, $k); - - my (@lookup) = ([3, 1, 1033], [3, 1, -1], [3, 0, 1033], [3, 0, -1], [2, 1, -1], [2, 2, -1], [2, 0, -1], - [0, 0, 0], [1, 0, 0]); - foreach $look (@lookup) - { - ($pid, $eid, $lid) = @$look; - if ($lid == -1) - { - foreach $k (keys %{$self->{'strings'}[$nid][$pid][$eid]}) - { - if (($res = $self->{strings}[$nid][$pid][$eid]{$k}) ne '') - { - $lid = $k; - last; - } - } - } else - { $res = $self->{strings}[$nid][$pid][$eid]{$lid} } - if ($res ne '') - { return wantarray ? ($res, $pid, $eid, $lid) : $res; } - } - return ''; -} - - -=head2 set_name($nid, $str[, $lang[, @cover]]) - -Sets the given name id string to $str for all platforms and encodings that -this module can handle. If $lang is set, it is interpretted as a language -tag and if the particular language of a string is found to match, then -that string is changed, otherwise no change occurs. - -If supplied, @cover should be a list of references to two-element arrays -containing pid,eid pairs that should added to the name table if not already present. - -This function does not add any names to the table unless @cover is supplied. - -=cut - -sub set_name -{ - my ($self, $nid, $str, $lang, @cover) = @_; - my ($pid, $eid, $lid, $c); - - foreach $pid (0 .. $#{$self->{'strings'}[$nid]}) - { - my $strNL = $str; - $strNL =~ s/\n/\r\n/og if $pid == 3; - $strNL =~ s/\n/\r/og if $pid == 1; - foreach $eid (0 .. $#{$self->{'strings'}[$nid][$pid]}) - { - foreach $lid (keys %{$self->{'strings'}[$nid][$pid][$eid]}) - { - next unless (!defined $lang || $self->match_lang($pid, $lid, $lang)); - $self->{'strings'}[$nid][$pid][$eid]{$lid} = $strNL; - foreach $c (0 .. scalar @cover) - { - next unless ($cover[$c][0] == $pid && $cover[$c][1] == $eid); - delete $cover[$c]; - last; - } - } - } - } - foreach $c (@cover) - { - my ($pid, $eid) = @{$c}; - my ($lid) = $self->find_lang($pid, $lang); - my $strNL = $str; - $strNL =~ s/\n/\r\n/og if $pid == 3; - $strNL =~ s/\n/\r/og if $pid == 1; - $self->{'strings'}[$nid][$pid][$eid]{$lid} = $strNL; - } - return $self; -} - -=head2 Font::TTF::Name->match_lang($pid, $lid, $lang) - -Compares the language associated to the string of given platform and language -with the given language tag. If the language matches the tag (i.e. is equal -or more defined than the given language tag) returns true. This is calculated -by finding whether the associated language tag starts with the given language -tag. - -=cut - -sub match_lang -{ - my ($self, $pid, $lid, $lang) = @_; - my ($langid) = $self->get_lang($pid, $lid); - - return ($lid == $lang) if ($lang != 0 || $lang eq '0'); - return !index(lc($langid), lc($lang)); -} - -=head2 Font::TTF::Name->get_lang($pid, $lid) - -Returns the language tag associated with a particular platform and language id - -=cut - -sub get_lang -{ - my ($self, $pid, $lid) = @_; - - if ($pid == 3) - { return $win_langs{$lid}; } - elsif ($pid == 1) - { return $mac_langs[$lid]; } - return ''; -} - - -=head2 Font::TTF::Name->find_lang($pid, $lang) - -Looks up the language name and returns a lang id if one exists - -=cut - -sub find_lang -{ - my ($self, $pid, $lang) = @_; - - if ($pid == 3) - { return $langs_win{$lang}; } - elsif ($pid == 1) - { return $langs_mac{$lang}; } - return undef; -} - - -BEGIN { -@apple_encs = ( -<<'EOT', -M>)RES==NCW$`@.'G_S5Q*L(!#?+K1VO4:.W6IJA-:\^BM?>L>1&NP(A0Q$BL -M<*!62ZV8Z1)[K]BE$MR#O,=/7OW]7T&*6"NMI4K31EOMM)>N@XXZZ2Q#IBZZ -MZJ:['GKJ)4NVWOKHJ]\_/\!`@PR68XBAALDUW`@CC3+:&&.-,UZ>?!-,-,ED -M4TPUS70SS#3+;`7FF&N>0D7F6V"A119;8JEEEEMAI5566V.M==;;H-A&FVRV -MQ5;;_OTONJ3<%;?<5^NQ1YYXYJGG7GKME3?>>N^=#S[ZY(O/OOKNFU]^JO<[ -M!$?LLMO>$#OAH4-*4F+'[(L+E*F,6SH:%\9%]C@>1W&CN&%2:9QNO]-))5ZH -M<]9.!^/DQ/8X-V[@@#,AS0ZE+KB7R$ODA\:A26@>6H2FH9D?J17^)(I#3C@8 -MLD)V?:(^"BE.AN30,F0XK\(Y5UUVW0TW77/'W;H_;JM6HRJ1&95%M0Y'E5%5 -.5.U4]""JB`?E$` -EOT - -undef, -undef, -undef, -<<'EOT', -M>)RES[=/%```1O$WO8G_@$'J';W70Z2WHS>5WJN%8D6%D;BZ,3*P,;#C2D(8 -M,9&)08V)+4*(1((X2'(#[.:;7[[\*./_%D,L<<230"(!@B213`JII)%.!IED -MD4T.N>213P&%%%%,B!)N4LJMR[Z<"BJIHIH::JFCG@;"--)$,RVTTD8['732 -M13>WN<-=>NBECWX&&&2(848898QQ)IADBFEFF.4>]WG`0^:89X%%'O&8)SSE -M&<]9X@4O><4R*Y?_.ZRSRQ[[''#(1S[PB<]NL\D7OO&5[_S@9TR`(XXYX1=O -M.>4W9_SAG`O^7OF=O>XW*N)WV!%''7/<"2>=S?<\K5O(G[7?/Y>'``` -EOT - -<<'EOT', -M>)RED$LSEW$`A9_-^00L,H-^(=>4Y%^2J'1Q*Y+[I2(BHA`B?!%J6EM1*28S -M;9II[/PI*7*_%TUN\_*VZ%W:FN9LSYEGGD,\_Q?#$?SP)X"C!!)$,"&$$L8Q -MPCG."2(X222GB,+%:XR"42N,P5KG*-1))()H54KG.# -M--*Y20:WR"2+;'+()8]\"BBDB-O$PM -M==3SA`8::>(IS;3PC%;::'?X'^W#?&(0-Z-,,,,TL\PSQP)+K+#,*C]9XQ?K -M_.8/FVRPQ0[;[+&+S=_]_J;KX/Y6I?&U.JQ.Z[GU0@-VBNTR@;Q4G]ZI5V_U -MQG@83^-M?,PAXV6'VF'ZH&Z]4H_>J]]IO=:0W!K6B#[KBT;U56/ZIN\:UX1^ -?:%)3FM:,9C6G>2UH44M:UHI6'?)RES5=OSG$`0.$CYR.(A(3DUS]J4WOO59O6;&F+UMY[7R&(V'N^4ETZ=*"J -M:M:H=>E*0D1B)7HC1KC0[R#G^LEA,/]7((Z(EK2B-?&TH2WM:$\'.M*)SG0A -M@:YTHSL]Z$DO>M.'OO2C/P,8R*`&/X2A#&,X(QC)*$:3R!C&,H[Q3&`BDYC, -M%))(9BK3F,X,9C*+%%*9S1S22">#NN(MWO.>#.\GG(Y_YQ!>^DAT7 -M\8WZ$%$3$OC.#W(IYC=_^!N"1SWF*<]ZP1AO*:'`;*^0%V502J6'*8LRHRQR -M/.)Q3WC2TY[QG+D6FF^!19ZGR(M>BA*]3"'5(9Z8.>:YVSV-DD/CT"0T#RU" -MT]",G^YUG_L]8+$E7O6%!WUIF>4^]9K7?6R%E59YQUM6>]L:[WK/5][WH;7> -4M,X'/O&1-WSF_\` -EOT - -<<'EOT', -M>)RERT=.%5``0-&+7K'&!B(@X/L/^/3>ZZ?SZ=*K@`KVWOL:U!68.#!&8G2@ -M$Q?F5/=@SOB0XO\$$D2**:&4)&644T$E55130RUUU--`(TTTTT(K;;3302== -M=--#[[_?1S\###+$,".,DF:,<2:89(II9KC`+'/,L\`B2RRSPBIKK+/!13;9 -M8IM+7.8*.^QRE6M]SG`0]YQ&.>\)1G/.<%+WG%:][PEI0G -M/>5IL\SVC#F>-=<\\SUG@846>=Y@PFBQ)9::M,QR*ZRTRFIKK+4N!+[[CD]\ -M#I%?9O*-+XGH/N?BMON=CT7\B#MQUR5^^MY#ZH('7?:PJQYQS14/L!?S,S[$ -M=,SD*[]#DH\>==UC;K@8LD)V*`B%(3?D\2<4>=Q-3[B5R#'#66>LM\%&FVRV -GQ5;;;+?#3KOLML=>4_;9[X"##CGLB*.F'7/<"2>=)RED-DVUG$`1;=:U*Y%0C)5O^^/SSS/F>>9#"$JE7D>"D6\3S=>Q^MPU^JF -M&^M"2JJHIH9:ZJBG@4:::*:%M[32 -M1CL==_TNNNFAES[Z&6"0(889890QQIE@DG=,,% -MF;XTRVQSS#7/5[[VC<&8D?D66&C<(HLML=0RRZVPTBJ7K;;&6NNLM\%&FVRV -L):388:===MMCKP,..F2_(XXZYK#CMKGZS[YU-]QTRVUWW'7/?0]N`4(?0WT` -EOT - -<<'EOT', -M>)RED,5.0U$415=(D.X!$"ANMX^VN+M#D>+N[H4"Q5W^APF_PZ\PY.9-"`-& -MY.3LG>-"#_\3@P^'8OP$"%)"*6644T$E55130RUUU--`(TTTTT(K;;3302== -M=-OZ7OH(T<\`@PP19I@11AECG`DFF6*:&6:98YX%%EEBF15666.=#3;98IL= -M=MECGP,.B7#$,5%...6,&.=<<,D5U]QPRQWW//#($\^\\,J;G?_II)ETXS79 -M)L<$C<,['S[GYSY=?FWK6E>Z^?L'BK,:KP0E*DD>R?6E*-7E='DM9BA36A49XKI_!M<9D8J -EOT - -<<'EOT', -M>)RED,E3SW$8QU_77@<''+A]^Y5(2-F7+"%92\B^ES5ES]H,)L(8&21E*UNH -M&"8T8ZS3I(FS_T"$_`L^-^/D8)YY/^]Y/\L\"Y/Y/XN()T8"B0P@B8$,(IG! -MI#"$H0PCE>&DDG,((N99#.+VM8SP8**&0CF]C,%K:RC2*V -M4TP).]C)+G:SA[WLHY3]'.`@ASC,$-(*3WG:,R%ZSDK/!K[@1<][R2HO6^T5:ZSUJM>\[@UO -M6F>]M[SM'>]ZSX90_\"'-MIDLX^">ASPQ*?!M_C,Y[ZP->KE*U_[QK>^\WW( -CM/O!ML"=?K3#3[Z,*_AKOR]V^=5O=OO='_ZTQU^_`2-%:*`` -EOT - -undef, -undef, -undef, -undef, -undef, -undef, -undef, -undef, -undef, -<<'EOT', -M>)REC]=.E&$`1(\%&W@4004%_7:!I?>.Z-+[TJL*=K"`BH`*J,_"+2'A!7PW -MX;\2[LG<3#*9G!F2G$V!&'$***2(!,644$H9Y5102175U%!+'?4TT$@3S;30 -M2AN/:.\HSG -M+++$"U[RBM>\X2WO6&:%]WS@(Y]898W/?.$KZWQC@TVV^,X/?K+-#KO\XC=_ -M(OX!?T/"`0<=-$T+WG9 -M*U[UFNEF>%V]X4TSO666V=[VCG?-,==[WC?/?!_XT&#,N`466F3"8DLLMLD&W2#COMLML>>^V+=IX\2<7BCCGNA)-. -0.>V,L\XY[P*'[!\#D^='L@`` -EOT - -undef, -undef, -undef, -undef, -undef, -undef, -undef, -undef, -undef, -); - -$cp_1252 = ( -<<'EOT', -M>)P-SD-B'5```,#YJ6VE>DEM&[\VD]JVF?H./4'-U+93V[9M:SV;$141(Y74 -MTD@KG?0RR"B3S++(*IOL:%9-$0&YD?BH22(82XF)10.3(@U(DDB$;F_/]% -M0_Y0(!0*A4-\R!5RQ]R*BX\,#'4CB?]];B3)`@LMLM@22RVSW`HKK;):LC76 -M6F>]#3;:9+,MMMIFNQUVVF6W/?;:9[\##CKDL"-2''7,<2><=,II9YQUSGD7 -M7'3)95=<=0@` -EOT -); -#' - -@ms_langids = ( [""], - ['ar', ["-SA", "-IQ", "-EG", "-LY", "-DZ", "-MA", "-TN", - "-OM", "-YE", "-SY", "-JO", "-LB", "-KW", "-AE", - "-BH", "-QA"]], - ['bg-BG'], - ['ca-ES'], - ['zh', ['-TW', 'CN', '-HK', '-SG', '-MO']], - ["cs-CZ"], - ["da-DK"], - ["de", ["-DE", "-CH", "-AT", "-LU", "-LI"]], - ["el-GR"], - ["en", ["-US", "-UK", "-AU", "-CA", "-NZ", "-IE", "-ZA", - "-JM", "029", "-BZ", "-TT", "-ZW", "-PH", "-ID", - "-HK", "-IN", "-MY", "-SG"]], - ["es", ["-ES", "-MX", "-ES", "-GT", "-CR", "-PA", "-DO", - "-VE", "-CO", "-PE", "-AR", "-EC", "-CL", "-UY", - "-PY", "-BO", "-SV", "-HN", "-NI", "-PR", "-US"]], - ["fi-FI"], - ["fr", ["-FR", "-BE", "-CA", "-CH", "-LU", "-MC", "", - "-RE", "-CG", "-SN", "-CM", "-CI", "-ML", "-MA", - "-HT"]], - ["he-IL"], - ["hu-HU"], - ["is-IS"], -# 0010 - ["it", ["-IT", "-CH"]], - ["ja-JP"], - ["ko-KR"], - ["nl", ["-NL", "-BE"]], - ["no", ["-bok-NO", "-nyn-NO"]], - ["pl-PL"], - ["pt", ["-BR", "-PT"]], - ["rm-CH"], - ["ro", ["-RO", "_MD"]], - ["ru-RU"], - ["hr", ["-HR", "-Latn-CS", "Cyrl-CS", "-BA", "", "-Latn-BA", "-Cyrl-BA"]], - ["sk-SK"], - ["sq-AL"], - ["sv", ["-SE", "-FI"]], - ["th-TH"], - ["tr-TR"], -# 0020 - ["ur", ["-PK", "tr-IN"]], - ["id-ID"], - ["uk-UA"], - ["be-BY"], - ["sl-SL"], - ["et-EE"], - ["lv-LV"], - ["lt-LT"], - ["tg-Cyrl-TJ"], - ["fa-IR"], - ["vi-VN"], - ["hy-AM"], - ["az", ["-Latn-AZ", "-Cyrl-AZ"]], - ["eu-ES"], - ["wen". ["wen-DE", "dsb-DE"]], - ["mk-MK"], -# 0030 - ["st"], - ["ts"], - ["tn-ZA"], - ["ven"], - ["xh-ZA"], - ["zu-ZA"], - ["af-ZA"], - ["ka-GE"], - ["fo-FO"], - ["hi-IN"], - ["mt"], - ["se", ["-NO", "-SE", "-FI", "smj-NO", "smj-SE", "sma-NO", "sma-SE", - "", "smn-FI"]], - ["ga-IE"], - ["yi"], - ["ms", ["-MY", "-BN"]], - ["kk-KZ"], -# 0040 - ["ky-KG"], - ["sw-KE"], - ["tk-TM"], - ["uz", ["-Latn-UZ", "-Cyrl-UZ"]], - ["tt-RU"], - ["bn", ["-IN", "-BD"]], - ["pa", ["-IN", "-Arab-PK"]], - ["gu-IN"], - ["or-IN"], - ["ta-IN"], - ["te-IN"], - ["kn-IN"], - ["ml-IN"], - ["as-IN"], - ["mr-IN"], - ["sa-IN"], -# 0050 - ["mn", ["-Cyrl-MN", "-Mong-CN"]], - ["bo", ["-CN", "-BT"]], - ["cy-GB"], - ["km-KH"], - ["lo-LA"], - ["my"], - ["gl-ES"], - ["kok-IN"], - ["mni"], - ["sd", ["-IN", "-PK"]], - ["syr-SY"], - ["si-LK"], - ["chr"], - ["iu", ["-Cans-CA", "-Latn-CA"]], - ["am-ET"], - ["tmz", ["-Arab", "tmz-Latn-DZ"]], -# 0060 - ["ks"], - ["ne", ["-NP", "-IN"]], - ["fy-NL"], - ["ps-AF"], - ["fil-PH"], - ["dv-MV"], - ["bin-NG"], - ["fuv-NG"], - ["ha-Latn-NG"], - ["ibb-NG"], - ["yo-NG"], - ["quz", ["-BO", "-EC", "-PE"]], - ["ns-ZA"], - ["ba-RU"], - ["lb-LU"], - ["kl-GL"], -# 0070 - ["ig-NG"], - ["kau"], - ["om"], - ["ti", ["-ET". "-ER"]], - ["gn"], - ["haw"], - ["la"], - ["so"], - ["ii-CN"], - ["pap"], - ["arn-CL"], - [""], # (unassigned) - ["moh-CA"], - [""], # (unassigned) - ["br-FR"], - [""], # (unassigned) -# 0080 - ["ug-CN"], - [""], # (unassigned) - ["oc-FR"], - ["gsw-FR"], - [""], # (unassigned) - ["sah-RU"], - ["qut-GT"], - ["rw-RW"], - ["wo-SN"], - [""], # (unassigned) - [""], # (unassigned) - [""], # (unassigned) - ["gbz-AF"], -); - -@mac_langs = ( - 'en', 'fr', 'de', 'it', 'nl', 'sv', 'es', 'da', 'pt', 'no', - 'he', 'ja', 'ar', 'fi', 'el', 'is', 'mt', 'tr', 'hr', 'zh-Hant', - 'ur', 'hi', 'th', 'ko', 'lt', 'pl', 'hu', 'et', 'lv', 'se', - 'fo', 'ru' ,'zh-Hans', 'nl', 'ga', 'sq', 'ro', 'cs', 'sk', - 'sl', 'yi', 'sr', 'mk', 'bg', 'uk', 'be', 'uz', 'kk', 'az-Cyrl', - 'az-Latn', 'hy', 'ka', 'mo', 'ky', 'abh', 'tuk', 'mn-Mong', 'mn-Cyrl', 'pst', - 'ku', 'ks', 'sd', 'bo', 'ne', 'sa', 'mr', 'bn', 'as', 'gu', - 'pa', 'or', 'ml', 'kn', 'ta', 'te', 'si', 'my', 'km', 'lo', - 'vi', 'id', 'tl', 'ms-Latn', 'ms-Arab', 'am', 'ti', 'tga', 'so', 'sw', - 'rw', 'rn', 'ny', 'mg', 'eo', '', '', '', '', '', - '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '', '', '', '', '', '', - '', '', '', '', '', '', '', '', 'cy', 'eu', - 'la', 'qu', 'gn', 'ay', 'tt', 'ug', 'dz', 'jv-Latn', 'su-Latn', - 'gl', 'af', 'br', 'iu', 'gd', 'gv', 'gd-IR-x-dotabove', 'to', 'el-polyton', 'kl', - 'az-Latn' -); - -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -Unicode type strings will be stored in utf8 for all known platforms, -once Perl 5.6 has been released and I can find all the mapping tables, etc. - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OS_2.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OS_2.pm deleted file mode 100644 index 0092732..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OS_2.pm +++ /dev/null @@ -1,354 +0,0 @@ -package Font::TTF::OS_2; - -=head1 NAME - -Font::TTF::OS_2 - the OS/2 table in a TTF font - -=head1 DESCRIPTION - -The OS/2 table has two versions and forms, one an extension of the other. This -module supports both forms and the switching between them. - -=head1 INSTANCE VARIABLES - -No other variables than those in table and those in the standard: - - Version - xAvgCharWidth - usWeightClass - usWidthClass - fsType - ySubscriptXSize - ySubScriptYSize - ySubscriptXOffset - ySubscriptYOffset - ySuperscriptXSize - ySuperscriptYSize - ySuperscriptXOffset - ySuperscriptYOffset - yStrikeoutSize - yStrikeoutPosition - sFamilyClass - bFamilyType - bSerifStyle - bWeight - bProportion - bContrast - bStrokeVariation - bArmStyle - bLetterform - bMidline - bXheight - ulUnicodeRange1 - ulUnicodeRange2 - ulUnicodeRange3 - ulUnicodeRange4 - achVendID - fsSelection - usFirstCharIndex - usLastCharIndex - sTypoAscender - sTypoDescender - sTypoLineGap - usWinAscent - usWinDescent - ulCodePageRange1 - ulCodePageRange2 - xHeight - CapHeight - defaultChar - breakChar - maxLookups - -Notice that versions 0, 1, 2 & 3 of the table are supported. Notice also that the -Panose variable has been broken down into its elements. - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA @fields @lens @field_info @weights); -use Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'xAvgCharWidth' => 's', - 'usWeightClass' => 'S', - 'usWidthClass' => 'S', - 'fsType' => 's', - 'ySubscriptXSize' => 's', - 'ySubScriptYSize' => 's', - 'ySubscriptXOffset' => 's', - 'ySubscriptYOffset' => 's', - 'ySuperscriptXSize' => 's', - 'ySuperscriptYSize' => 's', - 'ySuperscriptXOffset' => 's', - 'ySuperscriptYOffset' => 's', - 'yStrikeoutSize' => 's', - 'yStrikeoutPosition' => 's', - 'sFamilyClass' => 's', - 'bFamilyType' => 'C', - 'bSerifStyle' => 'C', - 'bWeight' => 'C', - 'bProportion' => 'C', - 'bContrast' => 'C', - 'bStrokeVariation' => 'C', - 'bArmStyle' => 'C', - 'bLetterform' => 'C', - 'bMidline' => 'C', - 'bXheight' => 'C', - 'ulUnicodeRange1' => 'L', - 'ulUnicodeRange2' => 'L', - 'ulUnicodeRange3' => 'L', - 'ulUnicodeRange4' => 'L', - 'achVendID' => 'L', - 'fsSelection' => 'S', - 'usFirstCharIndex' => 'S', - 'usLastCharIndex' => 'S', - 'sTypoAscender' => 'S', - 'sTypoDescender' => 's', - 'sTypoLineGap' => 'S', - 'usWinAscent' => 'S', - 'usWinDescent' => 'S', - '' => '', - 'ulCodePageRange1' => 'L', - 'ulCodePageRange2' => 'L', - '' => '', - 'xHeight' => 's', - 'CapHeight' => 's', - 'defaultChar' => 'S', - 'breakChar' => 'S', - 'maxLookups' => 's', - '' => '', # i.e. v3 is basically same as v2 - ); - -@weights = qw(64 14 27 35 100 20 14 42 63 3 6 35 20 56 56 17 4 49 56 71 31 10 18 3 18 2 166); - -use Font::TTF::Utils; - -sub init -{ - my ($k, $v, $c, $n, $i, $t, $j); - - $n = 0; - @lens = (76, 84, 94, 94); - for ($j = 0; $j < $#field_info; $j += 2) - { - if ($field_info[$j] eq '') - { - $n++; - next; - } - ($k, $v, $c) = TTF_Init_Fields($field_info[$j], $c, $field_info[$j+1]); - next unless defined $k && $k ne ""; - for ($i = $n; $i < 4; $i++) - { $fields[$i]{$k} = $v; } - } -} - - -=head2 $t->read - -Reads in the various values from disk (see details of OS/2 table) - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $ver); - - $self->SUPER::read or return $self; - - init unless defined $fields[2]{'xAvgCharWidth'}; - $self->{' INFILE'}->read($dat, 2); - $ver = unpack("n", $dat); - $self->{'Version'} = $ver; - if ($ver < 4) - { - $self->{' INFILE'}->read($dat, $lens[$ver]); - TTF_Read_Fields($self, $dat, $fields[$ver]); - } - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($ver); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $ver = $self->{'Version'}; - $fh->print(pack("n", $ver)); - $fh->print(TTF_Out_Fields($self, $fields[$ver], $lens[$ver])); - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $value) - -Tidies up the hex values to output them in hex - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $value) = @_; - my ($fh) = $context->{'fh'}; - - if ($key =~ m/^ul(?:Unicode|CodePage)Range\d$/o) - { $fh->printf("%s<%s>%08X\n", $depth, $key, $value, $key); } - elsif ($key eq 'achVendID') - { $fh->printf("%s<%s name='%s'/>\n", $depth, $key, pack('N', $value)); } - else - { return $self->SUPER::XML_element(@_); } - $self; -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Now handle them on the way back in - -=cut - -sub XML_end -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag =~ m/^ul(?:Unicode|CodePage)Range\d$/o) - { return hex($context->{'text'}); } - elsif ($tag eq 'achVendID') - { return unpack('N', $attrs{'name'}); } - else - { return $self->SUPER::XML_end(@_); } -} - -=head2 $t->update - -Updates the OS/2 table by getting information from other sources: - -Updates the C and C values based on the MS table in the -cmap. - -Updates the sTypoAscender, sTypoDescender & sTypoLineGap to be the same values -as Ascender, Descender and Linegap from the hhea table (assuming it is dirty) -and also sets usWinAscent to be the sum of Ascender+Linegap and usWinDescent to -be the negative of Descender. - -=cut - -sub update -{ - my ($self) = @_; - my ($map, @keys, $table, $i, $avg, $hmtx); - - return undef unless ($self->SUPER::update); - - $self->{' PARENT'}{'cmap'}->update; - $map = $self->{' PARENT'}{'cmap'}->find_ms || return undef; - $hmtx = $self->{' PARENT'}{'hmtx'}->read; - - @keys = sort {$a <=> $b} grep {$_ < 0x10000} keys %{$map->{'val'}}; - - $self->{'usFirstCharIndex'} = $keys[0]; - $self->{'usLastCharIndex'} = $keys[-1]; - - $table = $self->{' PARENT'}{'hhea'}->read; - - # try any way we can to get some real numbers passed around! - if (($self->{'fsSelection'} & 128) != 0) - { - # assume the user knows what they are doing and has sensible values already - } - elsif ($table->{'Ascender'} != 0 || $table->{'Descender'} != 0) - { - $self->{'sTypoAscender'} = $table->{'Ascender'}; - $self->{'sTypoDescender'} = $table->{'Descender'}; - $self->{'sTypoLineGap'} = $table->{'LineGap'}; - $self->{'usWinAscent'} = $self->{'sTypoAscender'} + $self->{'sTypoLineGap'}; - $self->{'usWinDescent'} = -$self->{'sTypoDescender'}; - } - elsif ($self->{'sTypoAscender'} != 0 || $self->{'sTypoDescender'} != 0) - { - $table->{'Ascender'} = $self->{'sTypoAscender'}; - $table->{'Descender'} = $self->{'sTypoDescender'}; - $table->{'LineGap'} = $self->{'sTypoLineGap'}; - $self->{'usWinAscent'} = $self->{'sTypoAscender'} + $self->{'sTypoLineGap'}; - $self->{'usWinDescent'} = -$self->{'sTypoDescender'}; - } - elsif ($self->{'usWinAscent'} != 0 || $self->{'usWinDescent'} != 0) - { - $self->{'sTypoAscender'} = $table->{'Ascender'} = $self->{'usWinAscent'}; - $self->{'sTypoDescender'} = $table->{'Descender'} = -$self->{'usWinDescent'}; - $self->{'sTypoLineGap'} = $table->{'LineGap'} = 0; - } - - if ($self->{'Version'} < 3) - { - for ($i = 0; $i < 26; $i++) - { $avg += $hmtx->{'advance'}[$map->{'val'}{$i + 0x0061}] * $weights[$i]; } - $avg += $hmtx->{'advance'}[$map->{'val'}{0x0020}] * $weights[-1]; - $self->{'xAvgCharWidth'} = $avg / 1000; - } - elsif ($self->{'Version'} > 2) - { - $i = 0; $avg = 0; - foreach (@{$hmtx->{'advance'}}) - { - next unless ($_); - $i++; - $avg += $_; - } - $avg /= $i if ($i); - $self->{'xAvgCharWidth'} = $avg; - } - - foreach $i (keys %{$map->{'val'}}) - { - if ($i >= 0x10000) - { - $self->{'ulUnicodeRange2'} |= 0x2000000; - last; - } - } - - $self->{'Version'} = 1 if (defined $self->{'ulCodePageRange1'} && $self->{'Version'} < 1); - $self->{'Version'} = 2 if (defined $self->{'maxLookups'} && $self->{'Version'} < 2); - - if ((exists $self->{' PARENT'}{'GPOS'} && $self->{' PARENT'}{'GPOS'}{' read'}) || - (exists $self->{' PARENT'}{'GSUB'} && $self->{' PARENT'}{'GSUB'}{' read'})) - { - # one or both of GPOS & GSUB exist and have been read or modified; so update usMaxContexts - my ($lp, $ls); - $lp = $self->{' PARENT'}{'GPOS'}->maxContext if exists $self->{' PARENT'}{'GPOS'}; - $ls = $self->{' PARENT'}{'GSUB'}->maxContext if exists $self->{' PARENT'}{'GSUB'}; - $self->{'maxLookups'} = $lp > $ls ? $lp : $ls; - } - - $self; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OTTags.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OTTags.pm deleted file mode 100644 index 71338e2..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OTTags.pm +++ /dev/null @@ -1,706 +0,0 @@ -package Font::TTF::OTTags; - -=head1 NAME - -Font::TTF::OTTags - Utilities for TrueType/OpenType tags - -=head1 SYNOPSIS - - use Font::TTF::OTTags qw( %tttags %ttnames readtagsfile ); - - # Look at built-in stuff: - $script_tag = $tttags{'SCRIPT'}{'Cypriot Syllabary'}; - $lang_name = $ttnames{'LANGUAGE'}{'AFK '} - - # Read latest tags file to add to built-in definitions - readtagsfile ("C:\\Program Files\\Microsoft VOLT\\TAGS.txt"); - -First-level keys to %tttags and %ttnames are: - -=over - -'SCRIPT' -- retrieve script tag or name - -'LANGUAGE' -- retrieve language tag or name - -'FEATURE' -- retrieve feature tag or name - -=back - -Built-in data has been derived from Microsoft's tag registry at -L, -updated to draft v1.5 of the OpenType Spec. - -=head1 METHODS - -=cut - -use strict; -use vars qw( %tttags %ttnames @EXPORT_OK @ISA ); -require Exporter; -@ISA = qw( Exporter ); -@EXPORT_OK = qw( %tttags %ttnames readtagsfile); - - -%tttags = ( - -# All data below derived from VOLT 1.3 TAGS.txt file. -# For conveninence of human checking, these are now sorted alphabetically. - -'SCRIPT' => { - "Arabic" => "arab", - "Armenian" => "armn", - "Balinese" => "bali", - "Bengali v.2" => "bng2", - "Bengali" => "beng", - "Bopomofo" => "bopo", - "Braille" => "brai", - "Buginese" => "bugi", - "Buhid" => "buhd", - "Byzantine Music" => "byzm", - "CJK Ideographic" => "hani", - "Canadian Syllabics" => "cans", - "Carian" => "cari", - "Cham" => "cham", - "Cherokee" => "cher", - "Coptic" => "copt", - "Cypriot Syllabary" => "cprt", - "Cyrillic" => "cyrl", - "Default" => "DFLT", - "Deseret" => "dsrt", - "Devanagari v.2" => "dev2", - "Devanagari" => "deva", - "Ethiopic" => "ethi", - "Georgian" => "geor", - "Glagolitic" => "glag", - "Gothic" => "goth", - "Greek" => "grek", - "Gujarati v.2" => "gjr2", - "Gujarati" => "gujr", - "Gurmukhi v.2" => "gur2", - "Gurmukhi" => "guru", - "Hangul Jamo" => "jamo", - "Hangul" => "hang", - "Hanunoo" => "hano", - "Hebrew" => "hebr", - "Hiragana" => "kana", - "Javanese" => "java", - "Kannada v.2" => "knd2", - "Kannada" => "knda", - "Katakana" => "kana", - "Kayah Li" => "kali", - "Kharosthi" => "khar", - "Khmer" => "khmr", - "Lao" => "lao ", - "Latin" => "latn", - "Lepcha" => "lepc", - "Limbu" => "limb", - "Linear B" => "linb", - "Lycian" => "lyci", - "Lydian" => "lydi", - "Malayalam v.2" => "mlm2", - "Malayalam" => "mlym", - "Mathematical Alphanumeric Symbols" => "math", - "Mongolian" => "mong", - "Musical Symbols" => "musc", - "Myanmar" => "mymr", - "N'Ko" => "nko ", - "New Tai Lue" => "talu", - "Ogham" => "ogam", - "Ol Chiki" => "olck", - "Old Italic" => "ital", - "Old Persian Cuneiform" => "xpeo", - "Oriya v.2" => "ory2", - "Oriya" => "orya", - "Osmanya" => "osma", - "Phags-pa" => "phag", - "Phoenician" => "phnx", - "Rejang" => "rjng", - "Runic" => "runr", - "Saurashtra" => "saur", - "Shavian" => "shaw", - "Sinhala" => "sinh", - "Sumero-Akkadian Cuneiform" => "xsux", - "Sundanese" => "sund", - "Syloti Nagri" => "sylo", - "Syriac" => "syrc", - "Tagalog" => "tglg", - "Tagbanwa" => "tagb", - "Tai Le" => "tale", - "Tamil v.2" => "tml2", - "Tamil" => "taml", - "Telugu v.2" => "tel2", - "Telugu" => "telu", - "Thaana" => "thaa", - "Thai" => "thai", - "Tibetan" => "tibt", - "Tifinagh" => "tfng", - "Ugaritic Cuneiform" => "ugar", - "Vai" => "vai ", - "Yi" => "yi ", - }, - -'LANGUAGE' => { - "Aari" => "ARI ", - "Abaza" => "ABA ", - "Abkhazian" => "ABK ", - "Adyghe" => "ADY ", - "Afar" => "AFR ", - "Afrikaans" => "AFK ", - "Agaw" => "AGW ", - "Albanian" => "SQI ", - "Alsatian" => "ALS ", - "Altai" => "ALT ", - "Amharic" => "AMH ", - "Arabic" => "ARA ", - "Arakanese" => "ARK ", - "Armenian" => "HYE ", - "Assamese" => "ASM ", - "Athapaskan" => "ATH ", - "Avar" => "AVR ", - "Awadhi" => "AWA ", - "Aymara" => "AYM ", - "Azeri" => "AZE ", - "Badaga" => "BAD ", - "Baghelkhandi" => "BAG ", - "Balante" => "BLN ", - "Balkar" => "BAL ", - "Balochi" => "BLI ", - "Balti" => "BLT ", - "Bambara" => "BMB ", - "Bamileke" => "BML ", - "Bashkir" => "BSH ", - "Basque" => "EUQ ", - "Baule" => "BAU ", - "Belarussian" => "BEL ", - "Bemba" => "BEM ", - "Bench" => "BCH ", - "Bengali" => "BEN ", - "Berber" => "BBR ", - "Beti" => "BTI ", - "Bhili" => "BHI ", - "Bhojpuri" => "BHO ", - "Bible Cree" => "BCR ", - "Bikol" => "BIK ", - "Bilen" => "BIL ", - "Blackfoot" => "BKF ", - "Bosnian" => "BOS ", - "Brahui" => "BRH ", - "Braj Bhasha" => "BRI ", - "Breton" => "BRE ", - "Bulgarian" => "BGR ", - "Burmese" => "BRM ", - "Carrier" => "CRR ", - "Catalan" => "CAT ", - "Cebuano" => "CEB ", - "Chaha Gurage" => "CHG ", - "Chattisgarhi" => "CHH ", - "Chechen" => "CHE ", - "Cherokee" => "CHR ", - "Chichewa" => "CHI ", - "Chin" => "QIN ", - "Chinese Hong Kong" => "ZHH ", - "Chinese Phonetic" => "ZHP ", - "Chinese Simplified" => "ZHS ", - "Chinese Traditional" => "ZHT ", - "Chipewyan" => "CHP ", - "Chukchi" => "CHK ", - "Church Slavonic" => "CSL ", - "Chuvash" => "CHU ", - "Comorian" => "CMR ", - "Coptic" => "COP ", - "Corsican" => "COS ", - "Cree" => "CRE ", - "Crimean Tatar" => "CRT ", - "Croatian" => "HRV ", - "Czech" => "CSY ", - "Dangme" => "DNG ", - "Danish" => "DAN ", - "Dargwa" => "DAR ", - "Dari" => "DRI ", - "Default" => "dflt", - "Dhivehi (OBSOLETE)" => "DHV ", - "Dhivehi" => "DIV ", - "Dinka" => "DNK ", - "Djerma" => "DJR ", - "Dogri" => "DGR ", - "Dungan" => "DUN ", - "Dutch" => "NLD ", - "Dzongkha" => "DZN ", - "Eastern Cree" => "ECR ", - "Ebira" => "EBI ", - "Edo" => "EDO ", - "Efik" => "EFI ", - "English" => "ENG ", - "Erzya" => "ERZ ", - "Esperanto" => "NTO ", - "Estonian" => "ETI ", - "Even" => "EVN ", - "Evenki" => "EVK ", - "Ewe" => "EWE ", - "Faroese" => "FOS ", - "Farsi" => "FAR ", - "Fijian" => "FJI ", - "Filipino" => "PIL ", - "Finnish" => "FIN ", - "Flemish" => "FLE ", - "Fon" => "FON ", - "Forest Nenets" => "FNE ", - "French Antillean" => "FAN ", - "French" => "FRA ", - "Frisian" => "FRI ", - "Friulian" => "FRL ", - "Fulani" => "FUL ", - "Futa" => "FTA ", - "Ga" => "GAD ", - "Gaelic" => "GAE ", - "Gagauz" => "GAG ", - "Galician" => "GAL ", - "Garhwali" => "GAW ", - "Garo" => "GRO ", - "Garshuni" => "GAR ", - "Ge'ez" => "GEZ ", - "Georgian" => "KAT ", - "German" => "DEU ", - "Gilyak" => "GIL ", - "Gondi" => "GON ", - "Greek" => "ELL ", - "Greenlandic" => "GRN ", - "Guarani" => "GUA ", - "Gujarati" => "GUJ ", - "Gumuz" => "GMZ ", - "Haitian" => "HAI ", - "Halam" => "HAL ", - "Hammer-Banna" => "HBN ", - "Harari" => "HRI ", - "Harauti" => "HAR ", - "Hausa" => "HAU ", - "Hawaiin" => "HAW ", - "Hebrew" => "IWR ", - "High Mari" => "HMA ", - "Hiligaynon" => "HIL ", - "Hindi" => "HIN ", - "Hindko" => "HND ", - "Ho" => "HO ", - "Hungarian" => "HUN ", - "Icelandic" => "ISL ", - "Igbo" => "IBO ", - "Ijo" => "IJO ", - "Ilokano" => "ILO ", - "Inari Sami" => "ISM ", - "Indonesian" => "IND ", - "Ingush" => "ING ", - "Inuktitut" => "INU ", - "Irish Traditional" => "IRT ", - "Irish" => "IRI ", - "Italian" => "ITA ", - "Japanese" => "JAN ", - "Javanese" => "JAV ", - "Judezmo" => "JUD ", - "Jula" => "JUL ", - "Kabardian" => "KAB ", - "Kachchi" => "KAC ", - "Kalenjin" => "KAL ", - "Kalmyk" => "KLM ", - "Kamba" => "KMB ", - "Kannada" => "KAN ", - "Kanuri" => "KNR ", - "Karachay" => "KAR ", - "Karaim" => "KRM ", - "Karakalpak" => "KRK ", - "Karelian" => "KRL ", - "Karen" => "KRN ", - "Kashmiri" => "KSH ", - "Kazakh" => "KAZ ", - "Kebena" => "KEB ", - "Khakass" => "KHA ", - "Khanty-Kazim" => "KHK ", - "Khanty-Shurishkar" => "KHS ", - "Khanty-Vakhi" => "KHV ", - "Khasi" => "KSI ", - "Khmer" => "KHM ", - "Khowar" => "KHW ", - "Khutsuri Georgian" => "KGE ", - "Kikongo" => "KON ", - "Kikuyu" => "KIK ", - "Kildin Sami" => "KSM ", - "Kirghiz" => "KIR ", - "Kisii" => "KIS ", - "Kodagu" => "KOD ", - "Kokni" => "KKN ", - "Komi-Permyak" => "KOP ", - "Komi-Zyrian" => "KOZ ", - "Komo" => "KMO ", - "Komso" => "KMS ", - "Konkani" => "KOK ", - "Koorete" => "KRT ", - "Korean Old Hangul" => "KOH ", - "Korean" => "KOR ", - "Koryak" => "KYK ", - "Kpelle" => "KPL ", - "Krio" => "KRI ", - "Kui" => "KUI ", - "Kulvi" => "KUL ", - "Kumaoni" => "KMN ", - "Kumyk" => "KUM ", - "Kurdish" => "KUR ", - "Kurukh" => "KUU ", - "Kuy" => "KUY ", - "L-Cree" => "LCR ", - "Ladakhi" => "LDK ", - "Ladin" => "LAD ", - "Lahuli" => "LAH ", - "Lak" => "LAK ", - "Lambani" => "LAM ", - "Lao" => "LAO ", - "Latin" => "LAT ", - "Latvian" => "LVI ", - "Laz" => "LAZ ", - "Lezgi" => "LEZ ", - "Limbu" => "LMB ", - "Lingala" => "LIN ", - "Lithuanian" => "LTH ", - "Lomwe" => "LMW ", - "Low Mari" => "LMA ", - "Lower Sorbian" => "LSB ", - "Luba" => "LUB ", - "Luganda" => "LUG ", - "Luhya" => "LUH ", - "Lule Sami" => "LSM ", - "Luo" => "LUO ", - "Luxembourgish" => "LTZ ", - "Macedonian" => "MKD ", - "Maithili" => "MTH ", - "Majang" => "MAJ ", - "Makua" => "MAK ", - "Malagasy" => "MLG ", - "Malay" => "MLY ", - "Malayalam Reformed" => "MLR ", - "Malayalam Traditional" => "MAL ", - "Male" => "MLE ", - "Malinke" => "MLN ", - "Maltese" => "MTS ", - "Manchu" => "MCH ", - "Mandinka" => "MND ", - "Maninka" => "MNK ", - "Manipuri" => "MNI ", - "Mansi" => "MAN ", - "Manx Gaelic" => "MNX ", - "Maori" => "MRI ", - "Mapudungun" => "MAP ", - "Marathi" => "MAR ", - "Marwari" => "MAW ", - "Mbundu" => "MBN ", - "Me'en" => "MEN ", - "Mende" => "MDE ", - "Mizo" => "MIZ ", - "Mohawk" => "MOH ", - "Moksha" => "MOK ", - "Moldavian" => "MOL ", - "Mon" => "MON ", - "Mongolian" => "MNG ", - "Moose Cree" => "MCR ", - "Moroccan" => "MOR ", - "Mundari" => "MUN ", - "N'Ko" => "NKO ", - "N-Cree" => "NCR ", - "Naga-Assamese" => "NAG ", - "Nagari" => "NGR ", - "Nanai" => "NAN ", - "Naskapi" => "NAS ", - "Ndebele" => "NDB ", - "Ndonga" => "NDG ", - "Nepali" => "NEP ", - "Newari" => "NEW ", - "Nisi" => "NIS ", - "Niuean" => "NIU ", - "Nkole" => "NKL ", - "Nogai" => "NOG ", - "Northern Sami" => "NSM ", - "Northern Tai" => "NTA ", - "Norway House Cree" => "NHC ", - "Norwegian" => "NOR ", - "Nynorsk" => "NYN ", - "Occitan" => "OCI ", - "Oji-Cree" => "OCR ", - "Ojibway" => "OJB ", - "Oriya" => "ORI ", - "Oromo" => "ORO ", - "Ossetian" => "OSS ", - "Palaung" => "PLG ", - "Palestinian Aramaic" => "PAA ", - "Pali" => "PAL ", - "Palpa" => "PAP ", - "Pashto" => "PAS ", - "Polish" => "PLK ", - "Polytonic Greek" => "PGR ", - "Portuguese" => "PTG ", - "Provencal" => "PRO ", - "Punjabi" => "PAN ", - "R-Cree" => "RCR ", - "Rajasthani" => "RAJ ", - "Rhaeto-Romanic" => "RMS ", - "Riang" => "RIA ", - "Romanian" => "ROM ", - "Romany" => "ROY ", - "Ruanda" => "RUA ", - "Russian Buriat" => "RBU ", - "Russian" => "RUS ", - "Rusyn" => "RSY ", - "Sadri" => "SAD ", - "Samoan" => "SMO ", - "Sango" => "SGO ", - "Sanskrit" => "SAN ", - "Santali" => "SAT ", - "Saraiki" => "SRK ", - "Sayisi" => "SAY ", - "Sekota" => "SEK ", - "Selkup" => "SEL ", - "Sena" => "SNA ", - "Serbian" => "SRB ", - "Serer" => "SRR ", - "Shan" => "SHN ", - "Sibe" => "SIB ", - "Sidamo" => "SID ", - "Silte Gurage" => "SIG ", - "Sindhi" => "SND ", - "Sinhalese" => "SNH ", - "Skolt Sami" => "SKS ", - "Slavey" => "SLA ", - "Slovak" => "SKY ", - "Slovenian" => "SLV ", - "Sodo Gurage" => "SOG ", - "Somali" => "SML ", - "Soninke" => "SNK ", - "Sotho" => "SOT ", - "South Slavey" => "SSL ", - "Southern Sami" => "SSM ", - "Spanish" => "ESP ", - "Suri" => "SUR ", - "Sutu" => "SXT ", - "Svan" => "SVA ", - "Swadaya Aramaic" => "SWA ", - "Swahili" => "SWK ", - "Swazi" => "SWZ ", - "Swedish" => "SVE ", - "Syriac" => "SYR ", - "TH-Cree" => "TCR ", - "Tabasaran" => "TAB ", - "Tahitian" => "THT ", - "Tai Lue" => "XBD ", - "Tajiki" => "TAJ ", - "Tamil" => "TAM ", - "Tatar" => "TAT ", - "Telugu" => "TEL ", - "Temne" => "TMN ", - "Thai" => "THA ", - "Tibetan" => "TIB ", - "Tigre" => "TGR ", - "Tigrinya" => "TGY ", - "Todo" => "TOD ", - "Tonga" => "TNG ", - "Tongan" => "TGN ", - "Tsonga" => "TSG ", - "Tswana" => "TNA ", - "Tulu" => "TUL ", - "Tundra Nenets" => "TNE ", - "Turkish" => "TRK ", - "Turkmen" => "TKM ", - "Turoyo Aramaic" => "TUA ", - "Tuvin" => "TUV ", - "Twi" => "TWI ", - "Udmurt" => "UDM ", - "Ukrainian" => "UKR ", - "Upper Sorbian" => "USB ", - "Urdu" => "URD ", - "Uyghur" => "UYG ", - "Uzbek" => "UZB ", - "Venda" => "VEN ", - "Vietnamese" => "VIT ", - "Wa" => "WA ", - "Wagdi" => "WAG ", - "Welsh" => "WEL ", - "West-Cree" => "WCR ", - "Wolof" => "WLF ", - "Woods Cree" => "DCR ", - "Xhosa" => "XHS ", - "Y-Cree" => "YCR ", - "Yakut" => "YAK ", - "Yi Classic" => "YIC ", - "Yi Modern" => "YIM ", - "Yiddish" => "JII ", - "Yoruba" => "YBA ", - "Zande" => "ZND ", - "Zulu" => "ZUL ", - }, - -'FEATURE' => { - "Above-Base Forms" => "abvf", - "Above-Base Mark Positioning" => "abvm", - "Above-Base Substitutions" => "abvs", - "Access All Alternates" => "aalt", - "Akhands" => "akhn", - "Alternate Annotation Forms" => "nalt", - "Alternate Half Widths" => "halt", - "Alternate Vertical Half Metrics" => "vhal", - "Alternate Vertical Metrics" => "valt", - "Alternative Fractions" => "afrc", - "Below-Base Forms" => "blwf", - "Below-Base Mark Positioning" => "blwm", - "Below-Base Substitutions" => "blws", - "Capital Spacing" => "cpsp", - "Case-Sensitive Forms" => "case", - "Centered CJK Punctuation" => "cpct", - "Conjunct Forms After Ro" => "cfar", - "Conjunct Forms" => "cjct", - "Contextual Alternates" => "calt", - "Contextual Ligatures" => "clig", - "Contextual Swash" => "cswh", - "Cursive Positioning" => "curs", - "Default Processing" => "dflt", - "Denominators" => "dnom", - "Diphthongs (OBSOLETE)" => "dpng", - "Discretionary Ligatures" => "dlig", - "Distances" => "dist", - "Expert Forms" => "expt", - "Final Glyph On Line Alternates" => "falt", - "Fractions" => "frac", - "Full Widths" => "fwid", - "Glyph Composition/Decomposition" => "ccmp", - "Halant Forms" => "haln", - "Half Forms" => "half", - "Half Widths" => "hwid", - "Hangul" => "hngl", - "Historical Forms" => "hist", - "Historical Ligatures" => "hlig", - "Hojo (JIS X 0212-1990) Kanji Forms" => "hojo", - "Horizontal Kana Alternates" => "hkna", - "Initial Forms" => "init", - "Isolated Forms" => "isol", - "Italics" => "ital", - "JIS2004 Forms" => "jp04", - "JIS78 Forms" => "jp78", - "JIS83 Forms" => "jp83", - "JIS90 Forms" => "jp90", - "Justification Alternates" => "jalt", - "Kerning" => "kern", - "Leading Jamo Forms" => "ljmo", - "Left Bounds" => "lfbd", - "Lining Figures" => "lnum", - "Localized Forms" => "locl", - "Mark Positioning via Substitution" => "mset", - "Mark Positioning" => "mark", - "Mark to Mark Positioning" => "mkmk", - "Mathematical Greek" => "mgrk", - "Medial Forms #2" => "med2", - "Medial Forms" => "medi", - "NLC Kanji Forms" => "nlck", - "Nukta Forms" => "nukt", - "Numerators" => "numr", - "Oldstyle Figures" => "onum", - "Optical Bounds" => "opbd", - "Optical Size" => "size", - "Ordinals" => "ordn", - "Ornaments" => "ornm", - "Petite Capitals From Capitals" => "c2pc", - "Petite Capitals" => "pcap", - "Post-base Forms" => "pstf", - "Post-base Substitutions" => "psts", - "Pre-base Forms" => "pref", - "Pre-base Substitutions" => "pres", - "Proportional Alternate Vertical Metrics" => "vpal", - "Proportional Alternate Widths" => "palt", - "Proportional Figures" => "pnum", - "Proportional Kana" => "pkna", - "Proportional Widths" => "pwid", - "Quarter Widths" => "qwid", - "Rakar Forms" => "rkrf", - "Randomize" => "rand", - "Reph Forms" => "rphf", - "Required Ligatures" => "rlig", - "Right Bounds" => "rtbd", - "Right-To-Left Alternates" => "rtla", - "Ruby Notation Forms" => "ruby", - "Scientific Inferiors" => "sinf", - "Simplified Forms" => "smpl", - "Slashed Zero" => "zero", - "Small Capitals From Capitals" => "c2sc", - "Small Capitals" => "smcp", - "Standard Ligatures" => "liga", - "Stylistic Alternates" => "salt", - "Stylistic Set 1" => "ss01", - "Stylistic Set 10" => "ss10", - "Stylistic Set 11" => "ss11", - "Stylistic Set 12" => "ss12", - "Stylistic Set 13" => "ss13", - "Stylistic Set 14" => "ss14", - "Stylistic Set 15" => "ss15", - "Stylistic Set 16" => "ss16", - "Stylistic Set 17" => "ss17", - "Stylistic Set 18" => "ss18", - "Stylistic Set 19" => "ss19", - "Stylistic Set 2" => "ss02", - "Stylistic Set 20" => "ss20", - "Stylistic Set 3" => "ss03", - "Stylistic Set 4" => "ss04", - "Stylistic Set 5" => "ss05", - "Stylistic Set 6" => "ss06", - "Stylistic Set 7" => "ss07", - "Stylistic Set 8" => "ss08", - "Stylistic Set 9" => "ss09", - "Subscript" => "subs", - "Superscript" => "sups", - "Swash" => "swsh", - "Tabular Figures" => "tnum", - "Terminal Forms #2" => "fin2", - "Terminal Forms #3" => "fin3", - "Terminal Forms" => "fina", - "Third Widths" => "twid", - "Titling" => "titl", - "Traditional Forms" => "trad", - "Traditional Name Forms" => "tnam", - "Trailing Jamo Forms" => "tjmo", - "Unicase" => "unic", - "Vattu Variants" => "vatu", - "Vertical Alternates and Rotation" => "vrt2", - "Vertical Kana Alternates" => "vkna", - "Vertical Kerning" => "vkrn", - "Vertical Writing" => "vert", - "Vowel Jamo Forms" => "vjmo", - } -); - -{ - foreach my $s (qw ( SCRIPT LANGUAGE FEATURE ) ) - { - map { $ttnames{$s}{$tttags{$s}{$_}} = $_ } keys %{$tttags{$s}}; - } -} - - -=head2 readtagsfile ( filename ) - -Read a file in the syntax of Tags.txt (included with Microsoft VOLT) to obtain additional/replacement tag definitions. - -Returns 0 if can't open the file; else 1. - -=cut - -sub readtagsfile -{ - my $fname = shift; - open (TAGS, $fname) or return 0; - my ($what, $name, $tag); - while () - { - ($what, $name, $tag) = (m/"([^"]*)", "([^"]*)", "([^"]*)"/); #" - $ttnames{$what}{$tag} = $name; - $tttags{$what}{$name} = $tag; - } - close TAGS; - return 1; -} - - - -1; diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldCmap.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldCmap.pm deleted file mode 100644 index 96545e2..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldCmap.pm +++ /dev/null @@ -1,358 +0,0 @@ -package Font::TTF::OldCmap; - -=head1 NAME - -Font::TTF::OldCmap - Character map table - -This module is deprecated - -=head1 DESCRIPTION - -Looks after the character map. The primary structure used for handling a cmap -is the L which handles the segmented arrays of format 4 tables, -and in a simpler form for format 0 tables. - -Due to the complexity of working with segmented arrays, most of the handling of -such arrays is via methods rather than via instance variables. - -One important feature of a format 4 table is that it always contains a segment -with a final address of 0xFFFF. If you are creating a table from scratch this is -important (although L can work quite happily without it). - - -=head1 INSTANCE VARIABLES - -The instance variables listed here are not preceeded by a space due to their -emulating structural information in the font. - -=over 4 - -=item Num - -Number of subtables in this table - -=item Tables - -An array of subtables ([0..Num-1]) - -=back - -Each subtables also has its own instance variables which are, again, not -preceeded by a space. - -=over 4 - -=item Platform - -The platform number for this subtable - -=item Encoding - -The encoding number for this subtable - -=item Format - -Gives the stored format of this subtable - -=item Ver - -Gives the version (or language) information for this subtable - -=item val - -This points to a L which contains the content of the particular -subtable. - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -require Font::TTF::Table; -require Font::TTF::Segarr; - -@ISA = qw(Font::TTF::Table); - - -=head2 $t->read - -Reads the cmap into memory. Format 4 subtables read the whole subtable and -fill in the segmented array accordingly. - -Format 2 subtables are not read at all. - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $i, $j, $k, $id, @ids, $s); - my ($start, $end, $range, $delta, $form, $len, $num, $ver); - my ($fh) = $self->{' INFILE'}; - - $self->SUPER::read or return $self; - $fh->read($dat, 4); - $self->{'Num'} = unpack("x2n", $dat); - $self->{'Tables'} = []; - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = {}; - $fh->read($dat, 8); - ($s->{'Platform'}, $s->{'Encoding'}, $s->{'LOC'}) = (unpack("nnN", $dat)); - $s->{'LOC'} += $self->{' OFFSET'}; - push(@{$self->{'Tables'}}, $s); - } - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - $fh->seek($s->{'LOC'}, 0); - $fh->read($dat, 6); - ($form, $len, $ver) = (unpack("n3", $dat)); - - $s->{'Format'} = $form; - $s->{'Ver'} = $ver; - if ($form == 0) - { - $s->{'val'} = Font::TTF::Segarr->new; - $fh->read($dat, 256); - $s->{'val'}->fastadd_segment(0, 2, unpack("C*", $dat)); - $s->{'Start'} = 0; - $s->{'Num'} = 256; - } elsif ($form == 6) - { - my ($start, $ecount); - - $fh->read($dat, 4); - ($start, $ecount) = unpack("n2", $dat); - $fh->read($dat, $ecount << 1); - $s->{'val'} = Font::TTF::Segarr->new; - $s->{'val'}->fastadd_segment($start, 2, unpack("n*", $dat)); - $s->{'Start'} = $start; - $s->{'Num'} = $ecount; - } elsif ($form == 2) - { -# no idea what to do here yet - } elsif ($form == 4) - { - $fh->read($dat, 8); - $num = unpack("n", $dat); - $num >>= 1; - $fh->read($dat, $len - 14); - $s->{'val'} = Font::TTF::Segarr->new; - for ($j = 0; $j < $num; $j++) - { - $end = unpack("n", substr($dat, $j << 1, 2)); - $start = unpack("n", substr($dat, ($j << 1) + ($num << 1) + 2, 2)); - $delta = unpack("n", substr($dat, ($j << 1) + ($num << 2) + 2, 2)); - $delta -= 65536 if $delta > 32767; - $range = unpack("n", substr($dat, ($j << 1) + $num * 6 + 2, 2)); - @ids = (); - for ($k = $start; $k <= $end; $k++) - { - if ($range == 0) - { $id = $k + $delta; } - else - { $id = unpack("n", substr($dat, ($j << 1) + $num * 6 + - 2 + ($k - $start) * 2 + $range, 2)) + $delta; } - $id -= 65536 if $id > 65536; - push (@ids, $id); - } - $s->{'val'}->fastadd_segment($start, 0, @ids); - } - $s->{'val'}->tidy; - $s->{'Num'} = 0x10000; # always ends here - $s->{'Start'} = $s->{'val'}[0]{'START'}; - } - } - $self; -} - - -=head2 $t->ms_lookup($uni) - -Given a Unicode value in the MS table (Platform 3, Encoding 1) locates that -table and looks up the appropriate glyph number from it. - -=cut - -sub ms_lookup -{ - my ($self, $uni) = @_; - - $self->find_ms || return undef unless (defined $self->{' mstable'}); - return $self->{' mstable'}{'val'}->at($uni); -} - - -=head2 $t->find_ms - -Finds the Microsoft Unicode table and sets the C instance variable -to it if found. Returns the table it finds. - -=cut -sub find_ms -{ - my ($self) = @_; - my ($i, $s, $alt); - - return $self->{' mstable'} if defined $self->{' mstable'}; - $self->read; - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - if ($s->{'Platform'} == 3) - { - $self->{' mstable'} = $s; - last if ($s->{'Encoding'} == 1); - } elsif ($s->{'Platform'} == 0 || ($s->{'Platform'} == 2 && $s->{'Encoding'} == 1)) - { $self->{' mstable'} = $s; } - } - $self->{' mstable'}; -} - - -=head2 $t->out($fh) - -Writes out a cmap table to a filehandle. If it has not been read, then -just copies from input file to output - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($loc, $s, $i, $base_loc, $j); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $base_loc = $fh->tell(); - $fh->print(pack("n2", 0, $self->{'Num'})); - - for ($i = 0; $i < $self->{'Num'}; $i++) - { $fh->print(pack("nnN", $self->{'Tables'}[$i]{'Platform'}, $self->{'Tables'}[$i]{'Encoding'}, 0)); } - - for ($i = 0; $i < $self->{'Num'}; $i++) - { - $s = $self->{'Tables'}[$i]; - $s->{'val'}->tidy; - $s->{' outloc'} = $fh->tell(); - $fh->print(pack("n3", $s->{'Format'}, 0, $s->{'Ver'})); # come back for length - if ($s->{'Format'} == 0) - { - $fh->print(pack("C256", $s->{'val'}->at(0, 256))); - } elsif ($s->{'Format'} == 6) - { - $fh->print(pack("n2", $s->{'Start'}, $s->{'Num'})); - $fh->print(pack("n*", $s->{'val'}->at($s->{'Start'}, $s->{'Num'}))); - } elsif ($s->{'Format'} == 2) - { - } elsif ($s->{'Format'} == 4) - { - my ($num, $sRange, $eSel); - my (@deltas, $delta, @range, $flat, $k, $segs, $count); - - $num = $#{$s->{'val'}} + 1; - $segs = $s->{'val'}; - for ($sRange = 1, $eSel = 0; $sRange <= $num; $eSel++) - { $sRange <<= 1;} - $eSel--; - $fh->print(pack("n4", $num * 2, $sRange, $eSel, ($num * 2) - $sRange)); - $fh->print(pack("n*", map {$_->{'START'} + $_->{'LEN'} - 1} @$segs)); - $fh->print(pack("n", 0)); - $fh->print(pack("n*", map {$_->{'START'}} @$segs)); - - for ($j = 0; $j < $num; $j++) - { - $delta = $segs->[$j]{'VAL'}[0]; $flat = 1; - for ($k = 1; $k < $segs->[$j]{'LEN'}; $k++) - { - if ($segs->[$j]{'VAL'}[$k] == 0) - { $flat = 0; } - if ($delta + $k != $segs->[$j]{'VAL'}[$k]) - { - $delta = 0; - last; - } - } - push (@range, $flat); - push (@deltas, ($delta ? $delta - $segs->[$j]{'START'} : 0)); - } - $fh->print(pack("n*", @deltas)); - - $count = 0; - for ($j = 0; $j < $num; $j++) - { - $delta = $deltas[$j]; - if ($delta != 0 && $range[$j] == 1) - { $range[$j] = 0; } - else - { - $range[$j] = ($count + $num - $j) << 1; - $count += $segs->[$j]{'LEN'}; - } - } - - $fh->print(pack("n*", @range)); - - for ($j = 0; $j < $num; $j++) - { - next if ($range[$j] == 0); - for ($k = 0; $k < $segs->[$j]{'LEN'}; $k++) - { $fh->print(pack("n", $segs->[$j]{'VAL'}[$k])); } - } - } - - $loc = $fh->tell(); - $fh->seek($s->{' outloc'} + 2, 0); - $fh->print(pack("n", $loc - $s->{' outloc'})); - $fh->seek($base_loc + 8 + ($i << 3), 0); - $fh->print(pack("N", $s->{' outloc'} - $base_loc)); - $fh->seek($loc, 0); - } - $self; -} - - -=head2 @map = $t->reverse([$num]) - -Returns a reverse map of the table of given number or the Microsoft -cmap. I.e. given a glyph gives the Unicode value for it. - -=cut - -sub reverse -{ - my ($self, $tnum) = @_; - my ($table) = defined $tnum ? $self->{'Tables'}[$tnum] : $self->find_ms; - my (@res, $i, $s, $first); - - foreach $s (@{$table->{'val'}}) - { - $first = $s->{'START'}; - map {$res[$_] = $first unless $res[$_]; $first++;} @{$s->{'VAL'}}; - } - @res; -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -No support for format 2 tables (MBCS) - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldMort.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldMort.pm deleted file mode 100644 index 4e30f42..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/OldMort.pm +++ /dev/null @@ -1,706 +0,0 @@ -package Font::TTF::OldMort; - -=head1 NAME - -Font::TTF::OldMort - Glyph Metamorphosis table in a font - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=item version - -table version number (Fixed: currently 1.0) - -=item chains - -list of metamorphosis chains, each of which has its own fields: - -=over - -=item defaultFlags - -chain's default subfeature flags (UInt32) - -=item featureEntries - -list of feature entries, each of which has fields: - -=over - -=item type - -=item setting - -=item enable - -=item disable - -=back - -=item subtables - -list of metamorphosis subtables, each of which has fields: - -=over - -=item type - -subtable type (0: rearrangement; 1: contextual substitution; 2: ligature; -4: non-contextual substitution; 5: insertion) - -=item direction - -processing direction ('LR' or 'RL') - -=item orientation - -applies to text in which orientation ('VH', 'V', or 'H') - -=item subFeatureFlags - -the subfeature flags controlling whether the table is used (UInt32) - -=back - -Further fields depend on the type of subtable: - -=over - -Rearrangement table: - -=over - -=item classes - -array of lists of glyphs - -=item states - -array of arrays of hashes{'nextState', 'flags'} - -=back - -Contextual substitution table: - -=over - -=item classes - -array of lists of glyphs - -=item states - -array of array of hashes{'nextState', 'flags', 'actions'}, where C -is an array of two elements which are offsets to be added to [marked, current] -glyph to get index into C (or C if no mapping to be applied) - -=item mappings - -list of glyph codes mapped to through the state table mappings - -=back - -Ligature table: - -Non-contextual substitution table: - -Insertion table: - -=back - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use IO::File; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $fh, $numChains); - - $self->SUPER::read or return $self; - - $fh = $self->{' INFILE'}; - - $fh->read($dat, 8); - ($self->{'version'}, $numChains) = TTF_Unpack("fL", $dat); - - my $chains = []; - foreach (1 .. $numChains) { - my $chainStart = $fh->tell(); - $fh->read($dat, 12); - my ($defaultFlags, $chainLength, $nFeatureEntries, $nSubtables) = TTF_Unpack("LLSS", $dat); - my $featureEntries = []; - foreach (1 .. $nFeatureEntries) { - $fh->read($dat, 12); - my ($featureType, $featureSetting, $enableFlags, $disableFlags) = TTF_Unpack("SSLL", $dat); - push @$featureEntries, { - 'type' => $featureType, - 'setting' => $featureSetting, - 'enable' => $enableFlags, - 'disable' => $disableFlags - }; - } - my $subtables = []; - foreach (1 .. $nSubtables) { - my $subtableStart = $fh->tell(); - $fh->read($dat, 8); - my ($length, $coverage, $subFeatureFlags) = TTF_Unpack("SSL", $dat); - my $type = $coverage & 0x0007; - - my $subtable = { - 'type' => $type, - 'direction' => (($coverage & 0x4000) ? 'RL' : 'LR'), - 'orientation' => (($coverage & 0x2000) ? 'VH' : ($coverage & 0x8000) ? 'V' : 'H'), - 'subFeatureFlags' => $subFeatureFlags - }; - - if ($type == 0) { # rearrangement - my ($classes, $states) = AAT_read_state_table($fh, 0); - $subtable->{'classes'} = $classes; - $subtable->{'states'} = $states; - } - - elsif ($type == 1) { # contextual - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 2); - - $fh->seek($stateTableStart, IO::File::SEEK_SET); - $fh->read($dat, 10); - my ($stateSize, $classTable, $stateArray, $entryTable, $mappingTables) = unpack("nnnnn", $dat); - my $limits = [$classTable, $stateArray, $entryTable, $mappingTables, $length - 8]; - - foreach (@$entries) { - my $actions = $_->{'actions'}; - foreach (@$actions) { - $_ = $_ ? $_ - ($mappingTables / 2) : undef; - } - } - - $subtable->{'classes'} = $classes; - $subtable->{'states'} = $states; - $subtable->{'mappings'} = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $mappingTables, $limits))]; - } - - elsif ($type == 2) { # ligature - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 0); - - $fh->seek($stateTableStart, IO::File::SEEK_SET); - $fh->read($dat, 14); - my ($stateSize, $classTable, $stateArray, $entryTable, - $ligActionTable, $componentTable, $ligatureTable) = unpack("nnnnnnn", $dat); - my $limits = [$classTable, $stateArray, $entryTable, $ligActionTable, $componentTable, $ligatureTable, $length - 8]; - - my %actions; - my $actionLists; - foreach (@$entries) { - my $offset = $_->{'flags'} & 0x3fff; - $_->{'flags'} &= ~0x3fff; - if ($offset != 0) { - if (not defined $actions{$offset}) { - $fh->seek($stateTableStart + $offset, IO::File::SEEK_SET); - my $actionList; - while (1) { - $fh->read($dat, 4); - my $action = unpack("N", $dat); - my ($last, $store, $component) = (($action & 0x80000000) != 0, ($action & 0xC0000000) != 0, ($action & 0x3fffffff)); - $component -= 0x40000000 if $component > 0x1fffffff; - $component -= $componentTable / 2; - push @$actionList, { 'store' => $store, 'component' => $component }; - last if $last; - } - push @$actionLists, $actionList; - $actions{$offset} = $#$actionLists; - } - $_->{'actions'} = $actions{$offset}; - } - } - - $subtable->{'componentTable'} = $componentTable; - my $components = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $componentTable, $limits))]; - foreach (@$components) { - $_ = ($_ - $ligatureTable) . " +" if $_ >= $ligatureTable; - } - $subtable->{'components'} = $components; - - $subtable->{'ligatureTable'} = $ligatureTable; - $subtable->{'ligatures'} = [unpack("n*", AAT_read_subtable($fh, $stateTableStart, $ligatureTable, $limits))]; - - $subtable->{'classes'} = $classes; - $subtable->{'states'} = $states; - $subtable->{'actionLists'} = $actionLists; - } - - elsif ($type == 4) { # non-contextual - my ($format, $lookup) = AAT_read_lookup($fh, 2, $length - 8, undef); - $subtable->{'format'} = $format; - $subtable->{'lookup'} = $lookup; - } - - elsif ($type == 5) { # insertion - my $stateTableStart = $fh->tell(); - my ($classes, $states, $entries) = AAT_read_state_table($fh, 2); - - my %insertListHash; - my $insertLists; - foreach (@$entries) { - my $flags = $_->{'flags'}; - my @insertCount = (($flags & 0x03e0) >> 5, ($flags & 0x001f)); - my $actions = $_->{'actions'}; - foreach (0 .. 1) { - if ($insertCount[$_] > 0) { - $fh->seek($stateTableStart + $actions->[$_], IO::File::SEEK_SET); - $fh->read($dat, $insertCount[$_] * 2); - if (not defined $insertListHash{$dat}) { - push @$insertLists, [unpack("n*", $dat)]; - $insertListHash{$dat} = $#$insertLists; - } - $actions->[$_] = $insertListHash{$dat}; - } - else { - $actions->[$_] = undef; - } - } - } - - $subtable->{'classes'} = $classes; - $subtable->{'states'} = $states; - $subtable->{'insertLists'} = $insertLists; - } - - else { - die "unknown subtable type"; - } - - push @$subtables, $subtable; - $fh->seek($subtableStart + $length, IO::File::SEEK_SET); - } - - push @$chains, { - 'defaultFlags' => $defaultFlags, - 'featureEntries' => $featureEntries, - 'subtables' => $subtables - }; - $fh->seek($chainStart + $chainLength, IO::File::SEEK_SET); - } - - $self->{'chains'} = $chains; - - $self; -} - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - my $chains = $self->{'chains'}; - $fh->print(TTF_Pack("fL", $self->{'version'}, scalar @$chains)); - - foreach (@$chains) { - my $chainStart = $fh->tell(); - my ($featureEntries, $subtables) = ($_->{'featureEntries'}, $_->{'subtables'}); - $fh->print(TTF_Pack("LLSS", $_->{'defaultFlags'}, 0, scalar @$featureEntries, scalar @$subtables)); # placeholder for length - - foreach (@$featureEntries) { - $fh->print(TTF_Pack("SSLL", $_->{'type'}, $_->{'setting'}, $_->{'enable'}, $_->{'disable'})); - } - - foreach (@$subtables) { - my $subtableStart = $fh->tell(); - my $type = $_->{'type'}; - my $coverage = $type; - $coverage += 0x4000 if $_->{'direction'} eq 'RL'; - $coverage += 0x2000 if $_->{'orientation'} eq 'VH'; - $coverage += 0x8000 if $_->{'orientation'} eq 'V'; - - $fh->print(TTF_Pack("SSL", 0, $coverage, $_->{'subFeatureFlags'})); # placeholder for length - - if ($type == 0) { # rearrangement - AAT_write_state_table($fh, $_->{'classes'}, $_->{'states'}, 0); - } - - elsif ($type == 1) { # contextual - my $stHeader = $fh->tell(); - $fh->print(pack("nnnnn", (0) x 5)); # placeholders for stateSize, classTable, stateArray, entryTable, mappingTables - - my $classTable = $fh->tell() - $stHeader; - my $classes = $_->{'classes'}; - AAT_write_classes($fh, $classes); - - my $stateArray = $fh->tell() - $stHeader; - my $states = $_->{'states'}; - my ($stateSize, $entries) = AAT_write_states($fh, $classes, $stateArray, $states, - sub { - my $actions = $_->{'actions'}; - ( $_->{'flags'}, @$actions ) - } - ); - - my $entryTable = $fh->tell() - $stHeader; - my $offset = ($entryTable + 8 * @$entries) / 2; - foreach (@$entries) { - my ($nextState, $flags, @parts) = split /,/; - $fh->print(pack("nnnn", $nextState, $flags, map { $_ eq "" ? 0 : $_ + $offset } @parts)); - } - - my $mappingTables = $fh->tell() - $stHeader; - my $mappings = $_->{'mappings'}; - $fh->print(pack("n*", @$mappings)); - - my $loc = $fh->tell(); - $fh->seek($stHeader, IO::File::SEEK_SET); - $fh->print(pack("nnnnn", $stateSize, $classTable, $stateArray, $entryTable, $mappingTables)); - $fh->seek($loc, IO::File::SEEK_SET); - } - - elsif ($type == 2) { # ligature - my $stHeader = $fh->tell(); - $fh->print(pack("nnnnnnn", (0) x 7)); # placeholders for stateSize, classTable, stateArray, entryTable, actionLists, components, ligatures - - my $classTable = $fh->tell() - $stHeader; - my $classes = $_->{'classes'}; - AAT_write_classes($fh, $classes); - - my $stateArray = $fh->tell() - $stHeader; - my $states = $_->{'states'}; - - my ($stateSize, $entries) = AAT_write_states($fh, $classes, $stateArray, $states, - sub { - ( $_->{'flags'} & 0xc000, $_->{'actions'} ) - } - ); - - my $actionLists = $_->{'actionLists'}; - my %actionListOffset; - my $actionListDataLength = 0; - my @actionListEntries; - foreach (0 .. $#$entries) { - my ($nextState, $flags, $offset) = split(/,/, $entries->[$_]); - if ($offset eq "") { - $offset = undef; - } - else { - if (defined $actionListOffset{$offset}) { - $offset = $actionListOffset{$offset}; - } - else { - $actionListOffset{$offset} = $actionListDataLength; - my $list = $actionLists->[$offset]; - $actionListDataLength += 4 * @$list; - push @actionListEntries, $list; - $offset = $actionListOffset{$offset}; - } - } - $entries->[$_] = [ $nextState, $flags, $offset ]; - } - my $entryTable = $fh->tell() - $stHeader; - my $ligActionLists = ($entryTable + @$entries * 4 + 3) & ~3; - foreach (@$entries) { - $_->[2] += $ligActionLists if defined $_->[2]; - $fh->print(pack("nn", $_->[0], $_->[1] + $_->[2])); - } - $fh->print(pack("C*", (0) x ($ligActionLists - $entryTable - @$entries * 4))); - - die "internal error" if $fh->tell() != $ligActionLists + $stHeader; - - my $componentTable = $fh->tell() - $stHeader + $actionListDataLength; - my $actionList; - foreach $actionList (@actionListEntries) { - foreach (0 .. $#$actionList) { - my $action = $actionList->[$_]; - my $val = $action->{'component'} + $componentTable / 2; - $val += 0x40000000 if $val < 0; - $val &= 0x3fffffff; - $val |= 0x40000000 if $action->{'store'}; - $val |= 0x80000000 if $_ == $#$actionList; - $fh->print(pack("N", $val)); - } - } - - die "internal error" if $fh->tell() != $componentTable + $stHeader; - - my $components = $_->{'components'}; - my $ligatureTable = $componentTable + @$components * 2; - $fh->print(pack("n*", map { (index($_, '+') >= 0 ? $ligatureTable : 0) + $_ } @$components)); - - my $ligatures = $_->{'ligatures'}; - $fh->print(pack("n*", @$ligatures)); - - my $loc = $fh->tell(); - $fh->seek($stHeader, IO::File::SEEK_SET); - $fh->print(pack("nnnnnnn", $stateSize, $classTable, $stateArray, $entryTable, $ligActionLists, $componentTable, $ligatureTable)); - $fh->seek($loc, IO::File::SEEK_SET); - } - - elsif ($type == 4) { # non-contextual - AAT_write_lookup($fh, $_->{'format'}, $_->{'lookup'}, 2, undef); - } - - elsif ($type == 5) { # insertion - } - - else { - die "unknown subtable type"; - } - - my $length = $fh->tell() - $subtableStart; - my $padBytes = (4 - ($length & 3)) & 3; - $fh->print(pack("C*", (0) x $padBytes)); - $length += $padBytes; - $fh->seek($subtableStart, IO::File::SEEK_SET); - $fh->print(pack("n", $length)); - $fh->seek($subtableStart + $length, IO::File::SEEK_SET); - } - - my $chainLength = $fh->tell() - $chainStart; - $fh->seek($chainStart + 4, IO::File::SEEK_SET); - $fh->print(pack("N", $chainLength)); - $fh->seek($chainStart + $chainLength, IO::File::SEEK_SET); - } -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - - $self->read; - my $feat = $self->{' PARENT'}->{'feat'}; - $feat->read; - my $post = $self->{' PARENT'}->{'post'}; - $post->read; - - $fh = 'STDOUT' unless defined $fh; - - $fh->printf("version %f\n", $self->{'version'}); - - my $chains = $self->{'chains'}; - foreach (@$chains) { - my $defaultFlags = $_->{'defaultFlags'}; - $fh->printf("chain: defaultFlags = %08x\n", $defaultFlags); - - my $featureEntries = $_->{'featureEntries'}; - foreach (@$featureEntries) { - $fh->printf("\tfeature %d, setting %d : enableFlags = %08x, disableFlags = %08x # '%s: %s'\n", - $_->{'type'}, $_->{'setting'}, $_->{'enable'}, $_->{'disable'}, - $feat->settingName($_->{'type'}, $_->{'setting'})); - } - - my $subtables = $_->{'subtables'}; - foreach (@$subtables) { - my $type = $_->{'type'}; - my $subFeatureFlags = $_->{'subFeatureFlags'}; - $fh->printf("\n\t%s table, %s, %s, subFeatureFlags = %08x # %s (%s)\n", - subtable_type_($type), $_->{'direction'}, $_->{'orientation'}, $subFeatureFlags, - "Default " . ((($subFeatureFlags & $defaultFlags) != 0) ? "On" : "Off"), - join(", ", - map { - join(": ", $feat->settingName($_->{'type'}, $_->{'setting'}) ) - } grep { ($_->{'enable'} & $subFeatureFlags) != 0 } @$featureEntries - ) ); - - if ($type == 0) { # rearrangement - print_classes_($fh, $_, $post); - - $fh->print("\n"); - my $states = $_->{'states'}; - my @verbs = ( "0", "Ax->xA", "xD->Dx", "AxD->DxA", - "ABx->xAB", "ABx->xBA", "xCD->CDx", "xCD->DCx", - "AxCD->CDxA", "AxCD->DCxA", "ABxD->DxAB", "ABxD->DxBA", - "ABxCD->CDxAB", "ABxCD->CDxBA", "ABxCD->DCxAB", "ABxCD->DCxBA"); - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "<" if ($_->{'flags'} & 0x8000); - $flags .= ">" if ($_->{'flags'} & 0x2000); - $fh->printf("\t(%s%d,%s)", $flags, $_->{'nextState'}, $verbs[($_->{'flags'} & 0x000f)]); - } - $fh->print("\n"); - } - } - - elsif ($type == 1) { # contextual - print_classes_($fh, $_, $post); - - $fh->print("\n"); - my $states = $_->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - my $actions = $_->{'actions'}; - $fh->printf("\t(%s%d,%s,%s)", $flags, $_->{'nextState'}, map { defined $_ ? $_ : "=" } @$actions); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $mappings = $_->{'mappings'}; - foreach (0 .. $#$mappings) { - $fh->printf("\t\tMapping %d: %d [%s]\n", $_, $mappings->[$_], $post->{'VAL'}[$mappings->[$_]]); - } - } - - elsif ($type == 2) { # ligature - print_classes_($fh, $_, $post); - - $fh->print("\n"); - my $states = $_->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - $fh->printf("\t(%s%d,%s)", $flags, $_->{'nextState'}, defined $_->{'actions'} ? $_->{'actions'} : "="); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $actionLists = $_->{'actionLists'}; - foreach (0 .. $#$actionLists) { - $fh->printf("\t\tList %d:\t", $_); - my $actionList = $actionLists->[$_]; - $fh->printf("%s\n", join(", ", map { ($_->{'component'} . ($_->{'store'} ? "*" : "") ) } @$actionList)); - } - - my $ligatureTable = $_->{'ligatureTable'}; - - $fh->print("\n"); - my $components = $_->{'components'}; - foreach (0 .. $#$components) { - $fh->printf("\t\tComponent %d: %s\n", $_, $components->[$_]); - } - - $fh->print("\n"); - my $ligatures = $_->{'ligatures'}; - foreach (0 .. $#$ligatures) { - $fh->printf("\t\tLigature %d: %d [%s]\n", $_, $ligatures->[$_], $post->{'VAL'}[$ligatures->[$_]]); - } - } - - elsif ($type == 4) { # non-contextual - my $lookup = $_->{'lookup'}; - $fh->printf("\t\tLookup format %d\n", $_->{'format'}); - if (defined $lookup) { - foreach (sort { $a <=> $b } keys %$lookup) { - $fh->printf("\t\t\t%d [%s] -> %d [%s])\n", $_, $post->{'VAL'}[$_], $lookup->{$_}, $post->{'VAL'}[$lookup->{$_}]); - } - } - } - - elsif ($type == 5) { # insertion - print_classes_($fh, $_, $post); - - $fh->print("\n"); - my $states = $_->{'states'}; - foreach (0 .. $#$states) { - $fh->printf("\t\tState %d:", $_); - my $state = $states->[$_]; - foreach (@$state) { - my $flags; - $flags .= "!" if ($_->{'flags'} & 0x4000); - $flags .= "*" if ($_->{'flags'} & 0x8000); - my $actions = $_->{'actions'}; - $fh->printf("\t(%s%d,%s,%s)", $flags, $_->{'nextState'}, map { defined $_ ? $_ : "=" } @$actions); - } - $fh->print("\n"); - } - - $fh->print("\n"); - my $insertLists = $_->{'insertLists'}; - foreach (0 .. $#$insertLists) { - my $insertList = $insertLists->[$_]; - $fh->printf("\t\tList %d: %s\n", $_, join(", ", map { $_ . " [" . $post->{'VAL'}[$_] . "]" } @$insertList)); - } - } - - else { - # unknown - } - } - } -} - -sub print_classes_ -{ - my ($fh, $subtable, $post) = @_; - - my $classes = $subtable->{'classes'}; - foreach (0 .. $#$classes) { - my $class = $classes->[$_]; - if (defined $class) { - $fh->printf("\t\tClass %d:\t%s\n", $_, join(", ", map { $_ . " [" . $post->{'VAL'}[$_] . "]" } @$class)); - } - } -} - -sub subtable_type_ -{ - my ($val) = @_; - my ($res); - - my @types = ( - 'Rearrangement', - 'Contextual', - 'Ligature', - undef, - 'Non-contextual', - 'Insertion', - ); - $res = $types[$val] or ('Undefined (' . $val . ')'); - - $res; -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PCLT.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PCLT.pm deleted file mode 100644 index 2856c16..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PCLT.pm +++ /dev/null @@ -1,121 +0,0 @@ -package Font::TTF::PCLT; - -=head1 NAME - -Font::TTF::PCLT - PCLT TrueType font table - -=head1 DESCRIPTION - -The PCLT table holds various pieces HP-PCL specific information. Information -here is generally not used by other software, except for the xHeight and -CapHeight which are stored here (if the table exists in a font). - -=head1 INSTANCE VARIABLES - -Only from table and the standard: - - version - FontNumber - Pitch - xHeight - Style - TypeFamily - CapHeight - SymbolSet - Typeface - CharacterComplement - FileName - StrokeWeight - WidthType - SerifStyle - -Notice that C, C and C return arrays -of unsigned characters of the appropriate length - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); - -require Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'version' => 'v', - 'FontNumber' => 'L', - 'Pitch' => 'S', - 'xHeight' => 'S', - 'Style' => 'S', - 'TypeFamily' => 'S', - 'CapHeight' => 'S', - 'SymbolSet' => 'S', - 'Typeface' => 'C16', - 'CharacterComplement' => 'C8', - 'FileName' => 'C6', - 'StrokeWeight' => 'C', - 'WidthType' => 'C', - 'SerifStyle' => 'c'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory thanks to some utility functions - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read || return $self; - - init unless defined $fields{'xHeight'}; - $self->{' INFILE'}->read($dat, 54); - - TTF_Read_Fields($self, $dat, \%fields); - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - $fh->print(TTF_Out_Fields($self, \%fields, 54)); -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PSNames.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PSNames.pm deleted file mode 100644 index cb4c73b..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/PSNames.pm +++ /dev/null @@ -1,4447 +0,0 @@ -package Font::TTF::PSNames; - -=head1 NAME - -Font::TTF::PSNames - Utilities for Postscript glyph name processing - -=head1 SYNOPSIS - - use Font::TTF::PSNames qw(parse lookup); - $name = lookup($uni); - $uni = parse($name); - -=head1 METHODS - -=cut - -use strict; -use vars qw(%names %agl @EXPORT_OK @ISA); -require Exporter; -@ISA = qw( Exporter ); -@EXPORT_OK = qw( parse lookup); - -# Adobe Glyph List for New Fonts -# from http://partners.adobe.com/asn/tech/type/aglfn13.txt - -%names = ( - '0020' => 'space', - '0021' => 'exclam', - '0022' => 'quotedbl', - '0023' => 'numbersign', - '0024' => 'dollar', - '0025' => 'percent', - '0026' => 'ampersand', - '0027' => 'quotesingle', - '0028' => 'parenleft', - '0029' => 'parenright', - '002A' => 'asterisk', - '002B' => 'plus', - '002C' => 'comma', - '002D' => 'hyphen', - '002E' => 'period', - '002F' => 'slash', - '0030' => 'zero', - '0031' => 'one', - '0032' => 'two', - '0033' => 'three', - '0034' => 'four', - '0035' => 'five', - '0036' => 'six', - '0037' => 'seven', - '0038' => 'eight', - '0039' => 'nine', - '003A' => 'colon', - '003B' => 'semicolon', - '003C' => 'less', - '003D' => 'equal', - '003E' => 'greater', - '003F' => 'question', - '0040' => 'at', - '0041' => 'A', - '0042' => 'B', - '0043' => 'C', - '0044' => 'D', - '0045' => 'E', - '0046' => 'F', - '0047' => 'G', - '0048' => 'H', - '0049' => 'I', - '004A' => 'J', - '004B' => 'K', - '004C' => 'L', - '004D' => 'M', - '004E' => 'N', - '004F' => 'O', - '0050' => 'P', - '0051' => 'Q', - '0052' => 'R', - '0053' => 'S', - '0054' => 'T', - '0055' => 'U', - '0056' => 'V', - '0057' => 'W', - '0058' => 'X', - '0059' => 'Y', - '005A' => 'Z', - '005B' => 'bracketleft', - '005C' => 'backslash', - '005D' => 'bracketright', - '005E' => 'asciicircum', - '005F' => 'underscore', - '0060' => 'grave', - '0061' => 'a', - '0062' => 'b', - '0063' => 'c', - '0064' => 'd', - '0065' => 'e', - '0066' => 'f', - '0067' => 'g', - '0068' => 'h', - '0069' => 'i', - '006A' => 'j', - '006B' => 'k', - '006C' => 'l', - '006D' => 'm', - '006E' => 'n', - '006F' => 'o', - '0070' => 'p', - '0071' => 'q', - '0072' => 'r', - '0073' => 's', - '0074' => 't', - '0075' => 'u', - '0076' => 'v', - '0077' => 'w', - '0078' => 'x', - '0079' => 'y', - '007A' => 'z', - '007B' => 'braceleft', - '007C' => 'bar', - '007D' => 'braceright', - '007E' => 'asciitilde', -# '00A0' => 'space', - '00A1' => 'exclamdown', - '00A2' => 'cent', - '00A3' => 'sterling', - '00A4' => 'currency', - '00A5' => 'yen', - '00A6' => 'brokenbar', - '00A7' => 'section', - '00A8' => 'dieresis', - '00A9' => 'copyright', - '00AA' => 'ordfeminine', - '00AB' => 'guillemotleft', - '00AC' => 'logicalnot', -# '00AD' => 'hyphen', - '00AE' => 'registered', - '00AF' => 'macron', - '00B0' => 'degree', - '00B1' => 'plusminus', - '00B2' => 'twosuperior', - '00B3' => 'threesuperior', - '00B4' => 'acute', - '00B5' => 'mu', - '00B6' => 'paragraph', - '00B7' => 'periodcentered', - '00B8' => 'cedilla', - '00B9' => 'onesuperior', - '00BA' => 'ordmasculine', - '00BB' => 'guillemotright', - '00BC' => 'onequarter', - '00BD' => 'onehalf', - '00BE' => 'threequarters', - '00BF' => 'questiondown', - '00C0' => 'Agrave', - '00C1' => 'Aacute', - '00C2' => 'Acircumflex', - '00C3' => 'Atilde', - '00C4' => 'Adieresis', - '00C5' => 'Aring', - '00C6' => 'AE', - '00C7' => 'Ccedilla', - '00C8' => 'Egrave', - '00C9' => 'Eacute', - '00CA' => 'Ecircumflex', - '00CB' => 'Edieresis', - '00CC' => 'Igrave', - '00CD' => 'Iacute', - '00CE' => 'Icircumflex', - '00CF' => 'Idieresis', - '00D0' => 'Eth', - '00D1' => 'Ntilde', - '00D2' => 'Ograve', - '00D3' => 'Oacute', - '00D4' => 'Ocircumflex', - '00D5' => 'Otilde', - '00D6' => 'Odieresis', - '00D7' => 'multiply', - '00D8' => 'Oslash', - '00D9' => 'Ugrave', - '00DA' => 'Uacute', - '00DB' => 'Ucircumflex', - '00DC' => 'Udieresis', - '00DD' => 'Yacute', - '00DE' => 'Thorn', - '00DF' => 'germandbls', - '00E0' => 'agrave', - '00E1' => 'aacute', - '00E2' => 'acircumflex', - '00E3' => 'atilde', - '00E4' => 'adieresis', - '00E5' => 'aring', - '00E6' => 'ae', - '00E7' => 'ccedilla', - '00E8' => 'egrave', - '00E9' => 'eacute', - '00EA' => 'ecircumflex', - '00EB' => 'edieresis', - '00EC' => 'igrave', - '00ED' => 'iacute', - '00EE' => 'icircumflex', - '00EF' => 'idieresis', - '00F0' => 'eth', - '00F1' => 'ntilde', - '00F2' => 'ograve', - '00F3' => 'oacute', - '00F4' => 'ocircumflex', - '00F5' => 'otilde', - '00F6' => 'odieresis', - '00F7' => 'divide', - '00F8' => 'oslash', - '00F9' => 'ugrave', - '00FA' => 'uacute', - '00FB' => 'ucircumflex', - '00FC' => 'udieresis', - '00FD' => 'yacute', - '00FE' => 'thorn', - '00FF' => 'ydieresis', - '0100' => 'Amacron', - '0101' => 'amacron', - '0102' => 'Abreve', - '0103' => 'abreve', - '0104' => 'Aogonek', - '0105' => 'aogonek', - '0106' => 'Cacute', - '0107' => 'cacute', - '0108' => 'Ccircumflex', - '0109' => 'ccircumflex', - '010A' => 'Cdotaccent', - '010B' => 'cdotaccent', - '010C' => 'Ccaron', - '010D' => 'ccaron', - '010E' => 'Dcaron', - '010F' => 'dcaron', - '0110' => 'Dcroat', - '0111' => 'dcroat', - '0112' => 'Emacron', - '0113' => 'emacron', - '0114' => 'Ebreve', - '0115' => 'ebreve', - '0116' => 'Edotaccent', - '0117' => 'edotaccent', - '0118' => 'Eogonek', - '0119' => 'eogonek', - '011A' => 'Ecaron', - '011B' => 'ecaron', - '011C' => 'Gcircumflex', - '011D' => 'gcircumflex', - '011E' => 'Gbreve', - '011F' => 'gbreve', - '0120' => 'Gdotaccent', - '0121' => 'gdotaccent', - '0122' => 'Gcommaaccent', - '0123' => 'gcommaaccent', - '0124' => 'Hcircumflex', - '0125' => 'hcircumflex', - '0126' => 'Hbar', - '0127' => 'hbar', - '0128' => 'Itilde', - '0129' => 'itilde', - '012A' => 'Imacron', - '012B' => 'imacron', - '012C' => 'Ibreve', - '012D' => 'ibreve', - '012E' => 'Iogonek', - '012F' => 'iogonek', - '0130' => 'Idotaccent', - '0131' => 'dotlessi', - '0132' => 'IJ', - '0133' => 'ij', - '0134' => 'Jcircumflex', - '0135' => 'jcircumflex', - '0136' => 'Kcommaaccent', - '0137' => 'kcommaaccent', - '0138' => 'kgreenlandic', - '0139' => 'Lacute', - '013A' => 'lacute', - '013B' => 'Lcommaaccent', - '013C' => 'lcommaaccent', - '013D' => 'Lcaron', - '013E' => 'lcaron', - '013F' => 'Ldot', - '0140' => 'ldot', - '0141' => 'Lslash', - '0142' => 'lslash', - '0143' => 'Nacute', - '0144' => 'nacute', - '0145' => 'Ncommaaccent', - '0146' => 'ncommaaccent', - '0147' => 'Ncaron', - '0148' => 'ncaron', - '0149' => 'napostrophe', - '014A' => 'Eng', - '014B' => 'eng', - '014C' => 'Omacron', - '014D' => 'omacron', - '014E' => 'Obreve', - '014F' => 'obreve', - '0150' => 'Ohungarumlaut', - '0151' => 'ohungarumlaut', - '0152' => 'OE', - '0153' => 'oe', - '0154' => 'Racute', - '0155' => 'racute', - '0156' => 'Rcommaaccent', - '0157' => 'rcommaaccent', - '0158' => 'Rcaron', - '0159' => 'rcaron', - '015A' => 'Sacute', - '015B' => 'sacute', - '015C' => 'Scircumflex', - '015D' => 'scircumflex', - '015E' => 'Scedilla', - '015F' => 'scedilla', - '0160' => 'Scaron', - '0161' => 'scaron', - '0162' => 'Tcommaaccent', - '0163' => 'tcommaaccent', - '0164' => 'Tcaron', - '0165' => 'tcaron', - '0166' => 'Tbar', - '0167' => 'tbar', - '0168' => 'Utilde', - '0169' => 'utilde', - '016A' => 'Umacron', - '016B' => 'umacron', - '016C' => 'Ubreve', - '016D' => 'ubreve', - '016E' => 'Uring', - '016F' => 'uring', - '0170' => 'Uhungarumlaut', - '0171' => 'uhungarumlaut', - '0172' => 'Uogonek', - '0173' => 'uogonek', - '0174' => 'Wcircumflex', - '0175' => 'wcircumflex', - '0176' => 'Ycircumflex', - '0177' => 'ycircumflex', - '0178' => 'Ydieresis', - '0179' => 'Zacute', - '017A' => 'zacute', - '017B' => 'Zdotaccent', - '017C' => 'zdotaccent', - '017D' => 'Zcaron', - '017E' => 'zcaron', - '017F' => 'longs', - '0192' => 'florin', - '01A0' => 'Ohorn', - '01A1' => 'ohorn', - '01AF' => 'Uhorn', - '01B0' => 'uhorn', - '01E6' => 'Gcaron', - '01E7' => 'gcaron', - '01FA' => 'Aringacute', - '01FB' => 'aringacute', - '01FC' => 'AEacute', - '01FD' => 'aeacute', - '01FE' => 'Oslashacute', - '01FF' => 'oslashacute', - '0218' => 'Scommaaccent', - '0219' => 'scommaaccent', -# '021A' => 'Tcommaaccent', -# '021B' => 'tcommaaccent', - '02BC' => 'afii57929', - '02BD' => 'afii64937', - '02C6' => 'circumflex', - '02C7' => 'caron', -# '02C9' => 'macron', - '02D8' => 'breve', - '02D9' => 'dotaccent', - '02DA' => 'ring', - '02DB' => 'ogonek', - '02DC' => 'tilde', - '02DD' => 'hungarumlaut', - '0300' => 'gravecomb', - '0301' => 'acutecomb', - '0303' => 'tildecomb', - '0309' => 'hookabovecomb', - '0323' => 'dotbelowcomb', - '0384' => 'tonos', - '0385' => 'dieresistonos', - '0386' => 'Alphatonos', - '0387' => 'anoteleia', - '0388' => 'Epsilontonos', - '0389' => 'Etatonos', - '038A' => 'Iotatonos', - '038C' => 'Omicrontonos', - '038E' => 'Upsilontonos', - '038F' => 'Omegatonos', - '0390' => 'iotadieresistonos', - '0391' => 'Alpha', - '0392' => 'Beta', - '0393' => 'Gamma', -# '0394' => 'Delta', - '0395' => 'Epsilon', - '0396' => 'Zeta', - '0397' => 'Eta', - '0398' => 'Theta', - '0399' => 'Iota', - '039A' => 'Kappa', - '039B' => 'Lambda', - '039C' => 'Mu', - '039D' => 'Nu', - '039E' => 'Xi', - '039F' => 'Omicron', - '03A0' => 'Pi', - '03A1' => 'Rho', - '03A3' => 'Sigma', - '03A4' => 'Tau', - '03A5' => 'Upsilon', - '03A6' => 'Phi', - '03A7' => 'Chi', - '03A8' => 'Psi', -# '03A9' => 'Omega', - '03AA' => 'Iotadieresis', - '03AB' => 'Upsilondieresis', - '03AC' => 'alphatonos', - '03AD' => 'epsilontonos', - '03AE' => 'etatonos', - '03AF' => 'iotatonos', - '03B0' => 'upsilondieresistonos', - '03B1' => 'alpha', - '03B2' => 'beta', - '03B3' => 'gamma', - '03B4' => 'delta', - '03B5' => 'epsilon', - '03B6' => 'zeta', - '03B7' => 'eta', - '03B8' => 'theta', - '03B9' => 'iota', - '03BA' => 'kappa', - '03BB' => 'lambda', -# '03BC' => 'mu', - '03BD' => 'nu', - '03BE' => 'xi', - '03BF' => 'omicron', - '03C0' => 'pi', - '03C1' => 'rho', - '03C2' => 'sigma1', - '03C3' => 'sigma', - '03C4' => 'tau', - '03C5' => 'upsilon', - '03C6' => 'phi', - '03C7' => 'chi', - '03C8' => 'psi', - '03C9' => 'omega', - '03CA' => 'iotadieresis', - '03CB' => 'upsilondieresis', - '03CC' => 'omicrontonos', - '03CD' => 'upsilontonos', - '03CE' => 'omegatonos', - '03D1' => 'theta1', - '03D2' => 'Upsilon1', - '03D5' => 'phi1', - '03D6' => 'omega1', - '0401' => 'afii10023', - '0402' => 'afii10051', - '0403' => 'afii10052', - '0404' => 'afii10053', - '0405' => 'afii10054', - '0406' => 'afii10055', - '0407' => 'afii10056', - '0408' => 'afii10057', - '0409' => 'afii10058', - '040A' => 'afii10059', - '040B' => 'afii10060', - '040C' => 'afii10061', - '040E' => 'afii10062', - '040F' => 'afii10145', - '0410' => 'afii10017', - '0411' => 'afii10018', - '0412' => 'afii10019', - '0413' => 'afii10020', - '0414' => 'afii10021', - '0415' => 'afii10022', - '0416' => 'afii10024', - '0417' => 'afii10025', - '0418' => 'afii10026', - '0419' => 'afii10027', - '041A' => 'afii10028', - '041B' => 'afii10029', - '041C' => 'afii10030', - '041D' => 'afii10031', - '041E' => 'afii10032', - '041F' => 'afii10033', - '0420' => 'afii10034', - '0421' => 'afii10035', - '0422' => 'afii10036', - '0423' => 'afii10037', - '0424' => 'afii10038', - '0425' => 'afii10039', - '0426' => 'afii10040', - '0427' => 'afii10041', - '0428' => 'afii10042', - '0429' => 'afii10043', - '042A' => 'afii10044', - '042B' => 'afii10045', - '042C' => 'afii10046', - '042D' => 'afii10047', - '042E' => 'afii10048', - '042F' => 'afii10049', - '0430' => 'afii10065', - '0431' => 'afii10066', - '0432' => 'afii10067', - '0433' => 'afii10068', - '0434' => 'afii10069', - '0435' => 'afii10070', - '0436' => 'afii10072', - '0437' => 'afii10073', - '0438' => 'afii10074', - '0439' => 'afii10075', - '043A' => 'afii10076', - '043B' => 'afii10077', - '043C' => 'afii10078', - '043D' => 'afii10079', - '043E' => 'afii10080', - '043F' => 'afii10081', - '0440' => 'afii10082', - '0441' => 'afii10083', - '0442' => 'afii10084', - '0443' => 'afii10085', - '0444' => 'afii10086', - '0445' => 'afii10087', - '0446' => 'afii10088', - '0447' => 'afii10089', - '0448' => 'afii10090', - '0449' => 'afii10091', - '044A' => 'afii10092', - '044B' => 'afii10093', - '044C' => 'afii10094', - '044D' => 'afii10095', - '044E' => 'afii10096', - '044F' => 'afii10097', - '0451' => 'afii10071', - '0452' => 'afii10099', - '0453' => 'afii10100', - '0454' => 'afii10101', - '0455' => 'afii10102', - '0456' => 'afii10103', - '0457' => 'afii10104', - '0458' => 'afii10105', - '0459' => 'afii10106', - '045A' => 'afii10107', - '045B' => 'afii10108', - '045C' => 'afii10109', - '045E' => 'afii10110', - '045F' => 'afii10193', - '0462' => 'afii10146', - '0463' => 'afii10194', - '0472' => 'afii10147', - '0473' => 'afii10195', - '0474' => 'afii10148', - '0475' => 'afii10196', - '0490' => 'afii10050', - '0491' => 'afii10098', - '04D9' => 'afii10846', - '05B0' => 'afii57799', - '05B1' => 'afii57801', - '05B2' => 'afii57800', - '05B3' => 'afii57802', - '05B4' => 'afii57793', - '05B5' => 'afii57794', - '05B6' => 'afii57795', - '05B7' => 'afii57798', - '05B8' => 'afii57797', - '05B9' => 'afii57806', - '05BB' => 'afii57796', - '05BC' => 'afii57807', - '05BD' => 'afii57839', - '05BE' => 'afii57645', - '05BF' => 'afii57841', - '05C0' => 'afii57842', - '05C1' => 'afii57804', - '05C2' => 'afii57803', - '05C3' => 'afii57658', - '05D0' => 'afii57664', - '05D1' => 'afii57665', - '05D2' => 'afii57666', - '05D3' => 'afii57667', - '05D4' => 'afii57668', - '05D5' => 'afii57669', - '05D6' => 'afii57670', - '05D7' => 'afii57671', - '05D8' => 'afii57672', - '05D9' => 'afii57673', - '05DA' => 'afii57674', - '05DB' => 'afii57675', - '05DC' => 'afii57676', - '05DD' => 'afii57677', - '05DE' => 'afii57678', - '05DF' => 'afii57679', - '05E0' => 'afii57680', - '05E1' => 'afii57681', - '05E2' => 'afii57682', - '05E3' => 'afii57683', - '05E4' => 'afii57684', - '05E5' => 'afii57685', - '05E6' => 'afii57686', - '05E7' => 'afii57687', - '05E8' => 'afii57688', - '05E9' => 'afii57689', - '05EA' => 'afii57690', - '05F0' => 'afii57716', - '05F1' => 'afii57717', - '05F2' => 'afii57718', - '060C' => 'afii57388', - '061B' => 'afii57403', - '061F' => 'afii57407', - '0621' => 'afii57409', - '0622' => 'afii57410', - '0623' => 'afii57411', - '0624' => 'afii57412', - '0625' => 'afii57413', - '0626' => 'afii57414', - '0627' => 'afii57415', - '0628' => 'afii57416', - '0629' => 'afii57417', - '062A' => 'afii57418', - '062B' => 'afii57419', - '062C' => 'afii57420', - '062D' => 'afii57421', - '062E' => 'afii57422', - '062F' => 'afii57423', - '0630' => 'afii57424', - '0631' => 'afii57425', - '0632' => 'afii57426', - '0633' => 'afii57427', - '0634' => 'afii57428', - '0635' => 'afii57429', - '0636' => 'afii57430', - '0637' => 'afii57431', - '0638' => 'afii57432', - '0639' => 'afii57433', - '063A' => 'afii57434', - '0640' => 'afii57440', - '0641' => 'afii57441', - '0642' => 'afii57442', - '0643' => 'afii57443', - '0644' => 'afii57444', - '0645' => 'afii57445', - '0646' => 'afii57446', - '0647' => 'afii57470', - '0648' => 'afii57448', - '0649' => 'afii57449', - '064A' => 'afii57450', - '064B' => 'afii57451', - '064C' => 'afii57452', - '064D' => 'afii57453', - '064E' => 'afii57454', - '064F' => 'afii57455', - '0650' => 'afii57456', - '0651' => 'afii57457', - '0652' => 'afii57458', - '0660' => 'afii57392', - '0661' => 'afii57393', - '0662' => 'afii57394', - '0663' => 'afii57395', - '0664' => 'afii57396', - '0665' => 'afii57397', - '0666' => 'afii57398', - '0667' => 'afii57399', - '0668' => 'afii57400', - '0669' => 'afii57401', - '066A' => 'afii57381', - '066D' => 'afii63167', - '0679' => 'afii57511', - '067E' => 'afii57506', - '0686' => 'afii57507', - '0688' => 'afii57512', - '0691' => 'afii57513', - '0698' => 'afii57508', - '06A4' => 'afii57505', - '06AF' => 'afii57509', - '06BA' => 'afii57514', - '06D2' => 'afii57519', - '06D5' => 'afii57534', - '1E80' => 'Wgrave', - '1E81' => 'wgrave', - '1E82' => 'Wacute', - '1E83' => 'wacute', - '1E84' => 'Wdieresis', - '1E85' => 'wdieresis', - '1EF2' => 'Ygrave', - '1EF3' => 'ygrave', - '200C' => 'afii61664', - '200D' => 'afii301', - '200E' => 'afii299', - '200F' => 'afii300', - '2012' => 'figuredash', - '2013' => 'endash', - '2014' => 'emdash', - '2015' => 'afii00208', - '2017' => 'underscoredbl', - '2018' => 'quoteleft', - '2019' => 'quoteright', - '201A' => 'quotesinglbase', - '201B' => 'quotereversed', - '201C' => 'quotedblleft', - '201D' => 'quotedblright', - '201E' => 'quotedblbase', - '2020' => 'dagger', - '2021' => 'daggerdbl', - '2022' => 'bullet', - '2024' => 'onedotenleader', - '2025' => 'twodotenleader', - '2026' => 'ellipsis', - '202C' => 'afii61573', - '202D' => 'afii61574', - '202E' => 'afii61575', - '2030' => 'perthousand', - '2032' => 'minute', - '2033' => 'second', - '2039' => 'guilsinglleft', - '203A' => 'guilsinglright', - '203C' => 'exclamdbl', - '2044' => 'fraction', -# '2070' => 'zerosuperior', -# '2074' => 'foursuperior', -# '2075' => 'fivesuperior', -# '2076' => 'sixsuperior', -# '2077' => 'sevensuperior', -# '2078' => 'eightsuperior', -# '2079' => 'ninesuperior', -# '207D' => 'parenleftsuperior', -# '207E' => 'parenrightsuperior', -# '207F' => 'nsuperior', -# '2080' => 'zeroinferior', -# '2081' => 'oneinferior', -# '2082' => 'twoinferior', -# '2083' => 'threeinferior', -# '2084' => 'fourinferior', -# '2085' => 'fiveinferior', -# '2086' => 'sixinferior', -# '2087' => 'seveninferior', -# '2088' => 'eightinferior', -# '2089' => 'nineinferior', -# '208D' => 'parenleftinferior', -# '208E' => 'parenrightinferior', - '20A1' => 'colonmonetary', - '20A3' => 'franc', - '20A4' => 'lira', - '20A7' => 'peseta', - '20AA' => 'afii57636', - '20AB' => 'dong', - '20AC' => 'Euro', - '2105' => 'afii61248', - '2111' => 'Ifraktur', - '2113' => 'afii61289', - '2116' => 'afii61352', - '2118' => 'weierstrass', - '211C' => 'Rfraktur', - '211E' => 'prescription', - '2122' => 'trademark', - '2126' => 'Omega', - '212E' => 'estimated', - '2135' => 'aleph', - '2153' => 'onethird', - '2154' => 'twothirds', - '215B' => 'oneeighth', - '215C' => 'threeeighths', - '215D' => 'fiveeighths', - '215E' => 'seveneighths', - '2190' => 'arrowleft', - '2191' => 'arrowup', - '2192' => 'arrowright', - '2193' => 'arrowdown', - '2194' => 'arrowboth', - '2195' => 'arrowupdn', - '21A8' => 'arrowupdnbse', - '21B5' => 'carriagereturn', - '21D0' => 'arrowdblleft', - '21D1' => 'arrowdblup', - '21D2' => 'arrowdblright', - '21D3' => 'arrowdbldown', - '21D4' => 'arrowdblboth', - '2200' => 'universal', - '2202' => 'partialdiff', - '2203' => 'existential', - '2205' => 'emptyset', - '2206' => 'Delta', - '2207' => 'gradient', - '2208' => 'element', - '2209' => 'notelement', - '220B' => 'suchthat', - '220F' => 'product', - '2211' => 'summation', - '2212' => 'minus', -# '2215' => 'fraction', - '2217' => 'asteriskmath', -# '2219' => 'periodcentered', - '221A' => 'radical', - '221D' => 'proportional', - '221E' => 'infinity', - '221F' => 'orthogonal', - '2220' => 'angle', - '2227' => 'logicaland', - '2228' => 'logicalor', - '2229' => 'intersection', - '222A' => 'union', - '222B' => 'integral', - '2234' => 'therefore', - '223C' => 'similar', - '2245' => 'congruent', - '2248' => 'approxequal', - '2260' => 'notequal', - '2261' => 'equivalence', - '2264' => 'lessequal', - '2265' => 'greaterequal', - '2282' => 'propersubset', - '2283' => 'propersuperset', - '2284' => 'notsubset', - '2286' => 'reflexsubset', - '2287' => 'reflexsuperset', - '2295' => 'circleplus', - '2297' => 'circlemultiply', - '22A5' => 'perpendicular', - '22C5' => 'dotmath', - '2302' => 'house', - '2310' => 'revlogicalnot', - '2320' => 'integraltp', - '2321' => 'integralbt', - '2329' => 'angleleft', - '232A' => 'angleright', - '2500' => 'SF100000', - '2502' => 'SF110000', - '250C' => 'SF010000', - '2510' => 'SF030000', - '2514' => 'SF020000', - '2518' => 'SF040000', - '251C' => 'SF080000', - '2524' => 'SF090000', - '252C' => 'SF060000', - '2534' => 'SF070000', - '253C' => 'SF050000', - '2550' => 'SF430000', - '2551' => 'SF240000', - '2552' => 'SF510000', - '2553' => 'SF520000', - '2554' => 'SF390000', - '2555' => 'SF220000', - '2556' => 'SF210000', - '2557' => 'SF250000', - '2558' => 'SF500000', - '2559' => 'SF490000', - '255A' => 'SF380000', - '255B' => 'SF280000', - '255C' => 'SF270000', - '255D' => 'SF260000', - '255E' => 'SF360000', - '255F' => 'SF370000', - '2560' => 'SF420000', - '2561' => 'SF190000', - '2562' => 'SF200000', - '2563' => 'SF230000', - '2564' => 'SF470000', - '2565' => 'SF480000', - '2566' => 'SF410000', - '2567' => 'SF450000', - '2568' => 'SF460000', - '2569' => 'SF400000', - '256A' => 'SF540000', - '256B' => 'SF530000', - '256C' => 'SF440000', - '2580' => 'upblock', - '2584' => 'dnblock', - '2588' => 'block', - '258C' => 'lfblock', - '2590' => 'rtblock', - '2591' => 'ltshade', - '2592' => 'shade', - '2593' => 'dkshade', - '25A0' => 'filledbox', - '25A1' => 'H22073', - '25AA' => 'H18543', - '25AB' => 'H18551', - '25AC' => 'filledrect', - '25B2' => 'triagup', - '25BA' => 'triagrt', - '25BC' => 'triagdn', - '25C4' => 'triaglf', - '25CA' => 'lozenge', - '25CB' => 'circle', - '25CF' => 'H18533', - '25D8' => 'invbullet', - '25D9' => 'invcircle', - '25E6' => 'openbullet', - '263A' => 'smileface', - '263B' => 'invsmileface', - '263C' => 'sun', - '2640' => 'female', - '2642' => 'male', - '2660' => 'spade', - '2663' => 'club', - '2665' => 'heart', - '2666' => 'diamond', - '266A' => 'musicalnote', - '266B' => 'musicalnotedbl', - 'FB00' => 'ff', - 'FB01' => 'fi', - 'FB02' => 'fl', - 'FB03' => 'ffi', - 'FB04' => 'ffl', - 'FB1F' => 'afii57705', - 'FB2A' => 'afii57694', - 'FB2B' => 'afii57695', - 'FB35' => 'afii57723', - 'FB4B' => 'afii57700', -); - -# Adobe Glyph List 2.0 (sans those in glyph list for *new* fonts) -- thus -# these are all historic names that could occur in fonts -# from http://partners.adobe.com/asn/tech/type/glyphlist.txt - -%agl = ( - 'AEmacron' => "\x{01E2}", - 'AEsmall' => "\x{F7E6}", - 'Aacutesmall' => "\x{F7E1}", - 'Abreveacute' => "\x{1EAE}", - 'Abrevecyrillic' => "\x{04D0}", - 'Abrevedotbelow' => "\x{1EB6}", - 'Abrevegrave' => "\x{1EB0}", - 'Abrevehookabove' => "\x{1EB2}", - 'Abrevetilde' => "\x{1EB4}", - 'Acaron' => "\x{01CD}", - 'Acircle' => "\x{24B6}", - 'Acircumflexacute' => "\x{1EA4}", - 'Acircumflexdotbelow' => "\x{1EAC}", - 'Acircumflexgrave' => "\x{1EA6}", - 'Acircumflexhookabove' => "\x{1EA8}", - 'Acircumflexsmall' => "\x{F7E2}", - 'Acircumflextilde' => "\x{1EAA}", - 'Acute' => "\x{F6C9}", - 'Acutesmall' => "\x{F7B4}", - 'Acyrillic' => "\x{0410}", - 'Adblgrave' => "\x{0200}", - 'Adieresiscyrillic' => "\x{04D2}", - 'Adieresismacron' => "\x{01DE}", - 'Adieresissmall' => "\x{F7E4}", - 'Adotbelow' => "\x{1EA0}", - 'Adotmacron' => "\x{01E0}", - 'Agravesmall' => "\x{F7E0}", - 'Ahookabove' => "\x{1EA2}", - 'Aiecyrillic' => "\x{04D4}", - 'Ainvertedbreve' => "\x{0202}", - 'Amonospace' => "\x{FF21}", - 'Aringbelow' => "\x{1E00}", - 'Aringsmall' => "\x{F7E5}", - 'Asmall' => "\x{F761}", - 'Atildesmall' => "\x{F7E3}", - 'Aybarmenian' => "\x{0531}", - 'Bcircle' => "\x{24B7}", - 'Bdotaccent' => "\x{1E02}", - 'Bdotbelow' => "\x{1E04}", - 'Becyrillic' => "\x{0411}", - 'Benarmenian' => "\x{0532}", - 'Bhook' => "\x{0181}", - 'Blinebelow' => "\x{1E06}", - 'Bmonospace' => "\x{FF22}", - 'Brevesmall' => "\x{F6F4}", - 'Bsmall' => "\x{F762}", - 'Btopbar' => "\x{0182}", - 'Caarmenian' => "\x{053E}", - 'Caron' => "\x{F6CA}", - 'Caronsmall' => "\x{F6F5}", - 'Ccedillaacute' => "\x{1E08}", - 'Ccedillasmall' => "\x{F7E7}", - 'Ccircle' => "\x{24B8}", - 'Cdot' => "\x{010A}", - 'Cedillasmall' => "\x{F7B8}", - 'Chaarmenian' => "\x{0549}", - 'Cheabkhasiancyrillic' => "\x{04BC}", - 'Checyrillic' => "\x{0427}", - 'Chedescenderabkhasiancyrillic' => "\x{04BE}", - 'Chedescendercyrillic' => "\x{04B6}", - 'Chedieresiscyrillic' => "\x{04F4}", - 'Cheharmenian' => "\x{0543}", - 'Chekhakassiancyrillic' => "\x{04CB}", - 'Cheverticalstrokecyrillic' => "\x{04B8}", - 'Chook' => "\x{0187}", - 'Circumflexsmall' => "\x{F6F6}", - 'Cmonospace' => "\x{FF23}", - 'Coarmenian' => "\x{0551}", - 'Csmall' => "\x{F763}", - 'DZ' => "\x{01F1}", - 'DZcaron' => "\x{01C4}", - 'Daarmenian' => "\x{0534}", - 'Dafrican' => "\x{0189}", - 'Dcedilla' => "\x{1E10}", - 'Dcircle' => "\x{24B9}", - 'Dcircumflexbelow' => "\x{1E12}", - 'Ddotaccent' => "\x{1E0A}", - 'Ddotbelow' => "\x{1E0C}", - 'Decyrillic' => "\x{0414}", - 'Deicoptic' => "\x{03EE}", - 'Deltagreek' => "\x{0394}", - 'Dhook' => "\x{018A}", - 'Dieresis' => "\x{F6CB}", - 'DieresisAcute' => "\x{F6CC}", - 'DieresisGrave' => "\x{F6CD}", - 'Dieresissmall' => "\x{F7A8}", - 'Digammagreek' => "\x{03DC}", - 'Djecyrillic' => "\x{0402}", - 'Dlinebelow' => "\x{1E0E}", - 'Dmonospace' => "\x{FF24}", - 'Dotaccentsmall' => "\x{F6F7}", - 'Dslash' => "\x{0110}", - 'Dsmall' => "\x{F764}", - 'Dtopbar' => "\x{018B}", - 'Dz' => "\x{01F2}", - 'Dzcaron' => "\x{01C5}", - 'Dzeabkhasiancyrillic' => "\x{04E0}", - 'Dzecyrillic' => "\x{0405}", - 'Dzhecyrillic' => "\x{040F}", - 'Eacutesmall' => "\x{F7E9}", - 'Ecedillabreve' => "\x{1E1C}", - 'Echarmenian' => "\x{0535}", - 'Ecircle' => "\x{24BA}", - 'Ecircumflexacute' => "\x{1EBE}", - 'Ecircumflexbelow' => "\x{1E18}", - 'Ecircumflexdotbelow' => "\x{1EC6}", - 'Ecircumflexgrave' => "\x{1EC0}", - 'Ecircumflexhookabove' => "\x{1EC2}", - 'Ecircumflexsmall' => "\x{F7EA}", - 'Ecircumflextilde' => "\x{1EC4}", - 'Ecyrillic' => "\x{0404}", - 'Edblgrave' => "\x{0204}", - 'Edieresissmall' => "\x{F7EB}", - 'Edot' => "\x{0116}", - 'Edotbelow' => "\x{1EB8}", - 'Efcyrillic' => "\x{0424}", - 'Egravesmall' => "\x{F7E8}", - 'Eharmenian' => "\x{0537}", - 'Ehookabove' => "\x{1EBA}", - 'Eightroman' => "\x{2167}", - 'Einvertedbreve' => "\x{0206}", - 'Eiotifiedcyrillic' => "\x{0464}", - 'Elcyrillic' => "\x{041B}", - 'Elevenroman' => "\x{216A}", - 'Emacronacute' => "\x{1E16}", - 'Emacrongrave' => "\x{1E14}", - 'Emcyrillic' => "\x{041C}", - 'Emonospace' => "\x{FF25}", - 'Encyrillic' => "\x{041D}", - 'Endescendercyrillic' => "\x{04A2}", - 'Enghecyrillic' => "\x{04A4}", - 'Enhookcyrillic' => "\x{04C7}", - 'Eopen' => "\x{0190}", - 'Ercyrillic' => "\x{0420}", - 'Ereversed' => "\x{018E}", - 'Ereversedcyrillic' => "\x{042D}", - 'Escyrillic' => "\x{0421}", - 'Esdescendercyrillic' => "\x{04AA}", - 'Esh' => "\x{01A9}", - 'Esmall' => "\x{F765}", - 'Etarmenian' => "\x{0538}", - 'Ethsmall' => "\x{F7F0}", - 'Etilde' => "\x{1EBC}", - 'Etildebelow' => "\x{1E1A}", - 'Ezh' => "\x{01B7}", - 'Ezhcaron' => "\x{01EE}", - 'Ezhreversed' => "\x{01B8}", - 'Fcircle' => "\x{24BB}", - 'Fdotaccent' => "\x{1E1E}", - 'Feharmenian' => "\x{0556}", - 'Feicoptic' => "\x{03E4}", - 'Fhook' => "\x{0191}", - 'Fitacyrillic' => "\x{0472}", - 'Fiveroman' => "\x{2164}", - 'Fmonospace' => "\x{FF26}", - 'Fourroman' => "\x{2163}", - 'Fsmall' => "\x{F766}", - 'GBsquare' => "\x{3387}", - 'Gacute' => "\x{01F4}", - 'Gammaafrican' => "\x{0194}", - 'Gangiacoptic' => "\x{03EA}", - 'Gcedilla' => "\x{0122}", - 'Gcircle' => "\x{24BC}", - 'Gdot' => "\x{0120}", - 'Gecyrillic' => "\x{0413}", - 'Ghadarmenian' => "\x{0542}", - 'Ghemiddlehookcyrillic' => "\x{0494}", - 'Ghestrokecyrillic' => "\x{0492}", - 'Gheupturncyrillic' => "\x{0490}", - 'Ghook' => "\x{0193}", - 'Gimarmenian' => "\x{0533}", - 'Gjecyrillic' => "\x{0403}", - 'Gmacron' => "\x{1E20}", - 'Gmonospace' => "\x{FF27}", - 'Grave' => "\x{F6CE}", - 'Gravesmall' => "\x{F760}", - 'Gsmall' => "\x{F767}", - 'Gsmallhook' => "\x{029B}", - 'Gstroke' => "\x{01E4}", - 'HPsquare' => "\x{33CB}", - 'Haabkhasiancyrillic' => "\x{04A8}", - 'Hadescendercyrillic' => "\x{04B2}", - 'Hardsigncyrillic' => "\x{042A}", - 'Hbrevebelow' => "\x{1E2A}", - 'Hcedilla' => "\x{1E28}", - 'Hcircle' => "\x{24BD}", - 'Hdieresis' => "\x{1E26}", - 'Hdotaccent' => "\x{1E22}", - 'Hdotbelow' => "\x{1E24}", - 'Hmonospace' => "\x{FF28}", - 'Hoarmenian' => "\x{0540}", - 'Horicoptic' => "\x{03E8}", - 'Hsmall' => "\x{F768}", - 'Hungarumlaut' => "\x{F6CF}", - 'Hungarumlautsmall' => "\x{F6F8}", - 'Hzsquare' => "\x{3390}", - 'IAcyrillic' => "\x{042F}", - 'IUcyrillic' => "\x{042E}", - 'Iacutesmall' => "\x{F7ED}", - 'Icaron' => "\x{01CF}", - 'Icircle' => "\x{24BE}", - 'Icircumflexsmall' => "\x{F7EE}", - 'Icyrillic' => "\x{0406}", - 'Idblgrave' => "\x{0208}", - 'Idieresisacute' => "\x{1E2E}", - 'Idieresiscyrillic' => "\x{04E4}", - 'Idieresissmall' => "\x{F7EF}", - 'Idot' => "\x{0130}", - 'Idotbelow' => "\x{1ECA}", - 'Iebrevecyrillic' => "\x{04D6}", - 'Iecyrillic' => "\x{0415}", - 'Igravesmall' => "\x{F7EC}", - 'Ihookabove' => "\x{1EC8}", - 'Iicyrillic' => "\x{0418}", - 'Iinvertedbreve' => "\x{020A}", - 'Iishortcyrillic' => "\x{0419}", - 'Imacroncyrillic' => "\x{04E2}", - 'Imonospace' => "\x{FF29}", - 'Iniarmenian' => "\x{053B}", - 'Iocyrillic' => "\x{0401}", - 'Iotaafrican' => "\x{0196}", - 'Ismall' => "\x{F769}", - 'Istroke' => "\x{0197}", - 'Itildebelow' => "\x{1E2C}", - 'Izhitsacyrillic' => "\x{0474}", - 'Izhitsadblgravecyrillic' => "\x{0476}", - 'Jaarmenian' => "\x{0541}", - 'Jcircle' => "\x{24BF}", - 'Jecyrillic' => "\x{0408}", - 'Jheharmenian' => "\x{054B}", - 'Jmonospace' => "\x{FF2A}", - 'Jsmall' => "\x{F76A}", - 'KBsquare' => "\x{3385}", - 'KKsquare' => "\x{33CD}", - 'Kabashkircyrillic' => "\x{04A0}", - 'Kacute' => "\x{1E30}", - 'Kacyrillic' => "\x{041A}", - 'Kadescendercyrillic' => "\x{049A}", - 'Kahookcyrillic' => "\x{04C3}", - 'Kastrokecyrillic' => "\x{049E}", - 'Kaverticalstrokecyrillic' => "\x{049C}", - 'Kcaron' => "\x{01E8}", - 'Kcedilla' => "\x{0136}", - 'Kcircle' => "\x{24C0}", - 'Kdotbelow' => "\x{1E32}", - 'Keharmenian' => "\x{0554}", - 'Kenarmenian' => "\x{053F}", - 'Khacyrillic' => "\x{0425}", - 'Kheicoptic' => "\x{03E6}", - 'Khook' => "\x{0198}", - 'Kjecyrillic' => "\x{040C}", - 'Klinebelow' => "\x{1E34}", - 'Kmonospace' => "\x{FF2B}", - 'Koppacyrillic' => "\x{0480}", - 'Koppagreek' => "\x{03DE}", - 'Ksicyrillic' => "\x{046E}", - 'Ksmall' => "\x{F76B}", - 'LJ' => "\x{01C7}", - 'LL' => "\x{F6BF}", - 'Lcedilla' => "\x{013B}", - 'Lcircle' => "\x{24C1}", - 'Lcircumflexbelow' => "\x{1E3C}", - 'Ldotaccent' => "\x{013F}", - 'Ldotbelow' => "\x{1E36}", - 'Ldotbelowmacron' => "\x{1E38}", - 'Liwnarmenian' => "\x{053C}", - 'Lj' => "\x{01C8}", - 'Ljecyrillic' => "\x{0409}", - 'Llinebelow' => "\x{1E3A}", - 'Lmonospace' => "\x{FF2C}", - 'Lslashsmall' => "\x{F6F9}", - 'Lsmall' => "\x{F76C}", - 'MBsquare' => "\x{3386}", - 'Macron' => "\x{F6D0}", - 'Macronsmall' => "\x{F7AF}", - 'Macute' => "\x{1E3E}", - 'Mcircle' => "\x{24C2}", - 'Mdotaccent' => "\x{1E40}", - 'Mdotbelow' => "\x{1E42}", - 'Menarmenian' => "\x{0544}", - 'Mmonospace' => "\x{FF2D}", - 'Msmall' => "\x{F76D}", - 'Mturned' => "\x{019C}", - 'NJ' => "\x{01CA}", - 'Ncedilla' => "\x{0145}", - 'Ncircle' => "\x{24C3}", - 'Ncircumflexbelow' => "\x{1E4A}", - 'Ndotaccent' => "\x{1E44}", - 'Ndotbelow' => "\x{1E46}", - 'Nhookleft' => "\x{019D}", - 'Nineroman' => "\x{2168}", - 'Nj' => "\x{01CB}", - 'Njecyrillic' => "\x{040A}", - 'Nlinebelow' => "\x{1E48}", - 'Nmonospace' => "\x{FF2E}", - 'Nowarmenian' => "\x{0546}", - 'Nsmall' => "\x{F76E}", - 'Ntildesmall' => "\x{F7F1}", - 'OEsmall' => "\x{F6FA}", - 'Oacutesmall' => "\x{F7F3}", - 'Obarredcyrillic' => "\x{04E8}", - 'Obarreddieresiscyrillic' => "\x{04EA}", - 'Ocaron' => "\x{01D1}", - 'Ocenteredtilde' => "\x{019F}", - 'Ocircle' => "\x{24C4}", - 'Ocircumflexacute' => "\x{1ED0}", - 'Ocircumflexdotbelow' => "\x{1ED8}", - 'Ocircumflexgrave' => "\x{1ED2}", - 'Ocircumflexhookabove' => "\x{1ED4}", - 'Ocircumflexsmall' => "\x{F7F4}", - 'Ocircumflextilde' => "\x{1ED6}", - 'Ocyrillic' => "\x{041E}", - 'Odblacute' => "\x{0150}", - 'Odblgrave' => "\x{020C}", - 'Odieresiscyrillic' => "\x{04E6}", - 'Odieresissmall' => "\x{F7F6}", - 'Odotbelow' => "\x{1ECC}", - 'Ogoneksmall' => "\x{F6FB}", - 'Ogravesmall' => "\x{F7F2}", - 'Oharmenian' => "\x{0555}", - 'Ohm' => "\x{2126}", - 'Ohookabove' => "\x{1ECE}", - 'Ohornacute' => "\x{1EDA}", - 'Ohorndotbelow' => "\x{1EE2}", - 'Ohorngrave' => "\x{1EDC}", - 'Ohornhookabove' => "\x{1EDE}", - 'Ohorntilde' => "\x{1EE0}", - 'Oi' => "\x{01A2}", - 'Oinvertedbreve' => "\x{020E}", - 'Omacronacute' => "\x{1E52}", - 'Omacrongrave' => "\x{1E50}", - 'Omegacyrillic' => "\x{0460}", - 'Omegagreek' => "\x{03A9}", - 'Omegaroundcyrillic' => "\x{047A}", - 'Omegatitlocyrillic' => "\x{047C}", - 'Omonospace' => "\x{FF2F}", - 'Oneroman' => "\x{2160}", - 'Oogonek' => "\x{01EA}", - 'Oogonekmacron' => "\x{01EC}", - 'Oopen' => "\x{0186}", - 'Oslashsmall' => "\x{F7F8}", - 'Osmall' => "\x{F76F}", - 'Ostrokeacute' => "\x{01FE}", - 'Otcyrillic' => "\x{047E}", - 'Otildeacute' => "\x{1E4C}", - 'Otildedieresis' => "\x{1E4E}", - 'Otildesmall' => "\x{F7F5}", - 'Pacute' => "\x{1E54}", - 'Pcircle' => "\x{24C5}", - 'Pdotaccent' => "\x{1E56}", - 'Pecyrillic' => "\x{041F}", - 'Peharmenian' => "\x{054A}", - 'Pemiddlehookcyrillic' => "\x{04A6}", - 'Phook' => "\x{01A4}", - 'Piwrarmenian' => "\x{0553}", - 'Pmonospace' => "\x{FF30}", - 'Psicyrillic' => "\x{0470}", - 'Psmall' => "\x{F770}", - 'Qcircle' => "\x{24C6}", - 'Qmonospace' => "\x{FF31}", - 'Qsmall' => "\x{F771}", - 'Raarmenian' => "\x{054C}", - 'Rcedilla' => "\x{0156}", - 'Rcircle' => "\x{24C7}", - 'Rdblgrave' => "\x{0210}", - 'Rdotaccent' => "\x{1E58}", - 'Rdotbelow' => "\x{1E5A}", - 'Rdotbelowmacron' => "\x{1E5C}", - 'Reharmenian' => "\x{0550}", - 'Ringsmall' => "\x{F6FC}", - 'Rinvertedbreve' => "\x{0212}", - 'Rlinebelow' => "\x{1E5E}", - 'Rmonospace' => "\x{FF32}", - 'Rsmall' => "\x{F772}", - 'Rsmallinverted' => "\x{0281}", - 'Rsmallinvertedsuperior' => "\x{02B6}", - 'Sacutedotaccent' => "\x{1E64}", - 'Sampigreek' => "\x{03E0}", - 'Scarondotaccent' => "\x{1E66}", - 'Scaronsmall' => "\x{F6FD}", - 'Schwa' => "\x{018F}", - 'Schwacyrillic' => "\x{04D8}", - 'Schwadieresiscyrillic' => "\x{04DA}", - 'Scircle' => "\x{24C8}", - 'Sdotaccent' => "\x{1E60}", - 'Sdotbelow' => "\x{1E62}", - 'Sdotbelowdotaccent' => "\x{1E68}", - 'Seharmenian' => "\x{054D}", - 'Sevenroman' => "\x{2166}", - 'Shaarmenian' => "\x{0547}", - 'Shacyrillic' => "\x{0428}", - 'Shchacyrillic' => "\x{0429}", - 'Sheicoptic' => "\x{03E2}", - 'Shhacyrillic' => "\x{04BA}", - 'Shimacoptic' => "\x{03EC}", - 'Sixroman' => "\x{2165}", - 'Smonospace' => "\x{FF33}", - 'Softsigncyrillic' => "\x{042C}", - 'Ssmall' => "\x{F773}", - 'Stigmagreek' => "\x{03DA}", - 'Tcedilla' => "\x{0162}", - 'Tcircle' => "\x{24C9}", - 'Tcircumflexbelow' => "\x{1E70}", - 'Tdotaccent' => "\x{1E6A}", - 'Tdotbelow' => "\x{1E6C}", - 'Tecyrillic' => "\x{0422}", - 'Tedescendercyrillic' => "\x{04AC}", - 'Tenroman' => "\x{2169}", - 'Tetsecyrillic' => "\x{04B4}", - 'Thook' => "\x{01AC}", - 'Thornsmall' => "\x{F7FE}", - 'Threeroman' => "\x{2162}", - 'Tildesmall' => "\x{F6FE}", - 'Tiwnarmenian' => "\x{054F}", - 'Tlinebelow' => "\x{1E6E}", - 'Tmonospace' => "\x{FF34}", - 'Toarmenian' => "\x{0539}", - 'Tonefive' => "\x{01BC}", - 'Tonesix' => "\x{0184}", - 'Tonetwo' => "\x{01A7}", - 'Tretroflexhook' => "\x{01AE}", - 'Tsecyrillic' => "\x{0426}", - 'Tshecyrillic' => "\x{040B}", - 'Tsmall' => "\x{F774}", - 'Twelveroman' => "\x{216B}", - 'Tworoman' => "\x{2161}", - 'Uacutesmall' => "\x{F7FA}", - 'Ucaron' => "\x{01D3}", - 'Ucircle' => "\x{24CA}", - 'Ucircumflexbelow' => "\x{1E76}", - 'Ucircumflexsmall' => "\x{F7FB}", - 'Ucyrillic' => "\x{0423}", - 'Udblacute' => "\x{0170}", - 'Udblgrave' => "\x{0214}", - 'Udieresisacute' => "\x{01D7}", - 'Udieresisbelow' => "\x{1E72}", - 'Udieresiscaron' => "\x{01D9}", - 'Udieresiscyrillic' => "\x{04F0}", - 'Udieresisgrave' => "\x{01DB}", - 'Udieresismacron' => "\x{01D5}", - 'Udieresissmall' => "\x{F7FC}", - 'Udotbelow' => "\x{1EE4}", - 'Ugravesmall' => "\x{F7F9}", - 'Uhookabove' => "\x{1EE6}", - 'Uhornacute' => "\x{1EE8}", - 'Uhorndotbelow' => "\x{1EF0}", - 'Uhorngrave' => "\x{1EEA}", - 'Uhornhookabove' => "\x{1EEC}", - 'Uhorntilde' => "\x{1EEE}", - 'Uhungarumlautcyrillic' => "\x{04F2}", - 'Uinvertedbreve' => "\x{0216}", - 'Ukcyrillic' => "\x{0478}", - 'Umacroncyrillic' => "\x{04EE}", - 'Umacrondieresis' => "\x{1E7A}", - 'Umonospace' => "\x{FF35}", - 'Upsilonacutehooksymbolgreek' => "\x{03D3}", - 'Upsilonafrican' => "\x{01B1}", - 'Upsilondieresishooksymbolgreek' => "\x{03D4}", - 'Upsilonhooksymbol' => "\x{03D2}", - 'Ushortcyrillic' => "\x{040E}", - 'Usmall' => "\x{F775}", - 'Ustraightcyrillic' => "\x{04AE}", - 'Ustraightstrokecyrillic' => "\x{04B0}", - 'Utildeacute' => "\x{1E78}", - 'Utildebelow' => "\x{1E74}", - 'Vcircle' => "\x{24CB}", - 'Vdotbelow' => "\x{1E7E}", - 'Vecyrillic' => "\x{0412}", - 'Vewarmenian' => "\x{054E}", - 'Vhook' => "\x{01B2}", - 'Vmonospace' => "\x{FF36}", - 'Voarmenian' => "\x{0548}", - 'Vsmall' => "\x{F776}", - 'Vtilde' => "\x{1E7C}", - 'Wcircle' => "\x{24CC}", - 'Wdotaccent' => "\x{1E86}", - 'Wdotbelow' => "\x{1E88}", - 'Wmonospace' => "\x{FF37}", - 'Wsmall' => "\x{F777}", - 'Xcircle' => "\x{24CD}", - 'Xdieresis' => "\x{1E8C}", - 'Xdotaccent' => "\x{1E8A}", - 'Xeharmenian' => "\x{053D}", - 'Xmonospace' => "\x{FF38}", - 'Xsmall' => "\x{F778}", - 'Yacutesmall' => "\x{F7FD}", - 'Yatcyrillic' => "\x{0462}", - 'Ycircle' => "\x{24CE}", - 'Ydieresissmall' => "\x{F7FF}", - 'Ydotaccent' => "\x{1E8E}", - 'Ydotbelow' => "\x{1EF4}", - 'Yericyrillic' => "\x{042B}", - 'Yerudieresiscyrillic' => "\x{04F8}", - 'Yhook' => "\x{01B3}", - 'Yhookabove' => "\x{1EF6}", - 'Yiarmenian' => "\x{0545}", - 'Yicyrillic' => "\x{0407}", - 'Yiwnarmenian' => "\x{0552}", - 'Ymonospace' => "\x{FF39}", - 'Ysmall' => "\x{F779}", - 'Ytilde' => "\x{1EF8}", - 'Yusbigcyrillic' => "\x{046A}", - 'Yusbigiotifiedcyrillic' => "\x{046C}", - 'Yuslittlecyrillic' => "\x{0466}", - 'Yuslittleiotifiedcyrillic' => "\x{0468}", - 'Zaarmenian' => "\x{0536}", - 'Zcaronsmall' => "\x{F6FF}", - 'Zcircle' => "\x{24CF}", - 'Zcircumflex' => "\x{1E90}", - 'Zdot' => "\x{017B}", - 'Zdotbelow' => "\x{1E92}", - 'Zecyrillic' => "\x{0417}", - 'Zedescendercyrillic' => "\x{0498}", - 'Zedieresiscyrillic' => "\x{04DE}", - 'Zhearmenian' => "\x{053A}", - 'Zhebrevecyrillic' => "\x{04C1}", - 'Zhecyrillic' => "\x{0416}", - 'Zhedescendercyrillic' => "\x{0496}", - 'Zhedieresiscyrillic' => "\x{04DC}", - 'Zlinebelow' => "\x{1E94}", - 'Zmonospace' => "\x{FF3A}", - 'Zsmall' => "\x{F77A}", - 'Zstroke' => "\x{01B5}", - 'aabengali' => "\x{0986}", - 'aadeva' => "\x{0906}", - 'aagujarati' => "\x{0A86}", - 'aagurmukhi' => "\x{0A06}", - 'aamatragurmukhi' => "\x{0A3E}", - 'aarusquare' => "\x{3303}", - 'aavowelsignbengali' => "\x{09BE}", - 'aavowelsigndeva' => "\x{093E}", - 'aavowelsigngujarati' => "\x{0ABE}", - 'abbreviationmarkarmenian' => "\x{055F}", - 'abbreviationsigndeva' => "\x{0970}", - 'abengali' => "\x{0985}", - 'abopomofo' => "\x{311A}", - 'abreveacute' => "\x{1EAF}", - 'abrevecyrillic' => "\x{04D1}", - 'abrevedotbelow' => "\x{1EB7}", - 'abrevegrave' => "\x{1EB1}", - 'abrevehookabove' => "\x{1EB3}", - 'abrevetilde' => "\x{1EB5}", - 'acaron' => "\x{01CE}", - 'acircle' => "\x{24D0}", - 'acircumflexacute' => "\x{1EA5}", - 'acircumflexdotbelow' => "\x{1EAD}", - 'acircumflexgrave' => "\x{1EA7}", - 'acircumflexhookabove' => "\x{1EA9}", - 'acircumflextilde' => "\x{1EAB}", - 'acutebelowcmb' => "\x{0317}", - 'acutecmb' => "\x{0301}", - 'acutedeva' => "\x{0954}", - 'acutelowmod' => "\x{02CF}", - 'acutetonecmb' => "\x{0341}", - 'acyrillic' => "\x{0430}", - 'adblgrave' => "\x{0201}", - 'addakgurmukhi' => "\x{0A71}", - 'adeva' => "\x{0905}", - 'adieresiscyrillic' => "\x{04D3}", - 'adieresismacron' => "\x{01DF}", - 'adotbelow' => "\x{1EA1}", - 'adotmacron' => "\x{01E1}", - 'aekorean' => "\x{3150}", - 'aemacron' => "\x{01E3}", - 'afii08941' => "\x{20A4}", - 'afii10063' => "\x{F6C4}", - 'afii10064' => "\x{F6C5}", - 'afii10192' => "\x{F6C6}", - 'afii10831' => "\x{F6C7}", - 'afii10832' => "\x{F6C8}", - 'agujarati' => "\x{0A85}", - 'agurmukhi' => "\x{0A05}", - 'ahiragana' => "\x{3042}", - 'ahookabove' => "\x{1EA3}", - 'aibengali' => "\x{0990}", - 'aibopomofo' => "\x{311E}", - 'aideva' => "\x{0910}", - 'aiecyrillic' => "\x{04D5}", - 'aigujarati' => "\x{0A90}", - 'aigurmukhi' => "\x{0A10}", - 'aimatragurmukhi' => "\x{0A48}", - 'ainarabic' => "\x{0639}", - 'ainfinalarabic' => "\x{FECA}", - 'aininitialarabic' => "\x{FECB}", - 'ainmedialarabic' => "\x{FECC}", - 'ainvertedbreve' => "\x{0203}", - 'aivowelsignbengali' => "\x{09C8}", - 'aivowelsigndeva' => "\x{0948}", - 'aivowelsigngujarati' => "\x{0AC8}", - 'akatakana' => "\x{30A2}", - 'akatakanahalfwidth' => "\x{FF71}", - 'akorean' => "\x{314F}", - 'alef' => "\x{05D0}", - 'alefarabic' => "\x{0627}", - 'alefdageshhebrew' => "\x{FB30}", - 'aleffinalarabic' => "\x{FE8E}", - 'alefhamzaabovearabic' => "\x{0623}", - 'alefhamzaabovefinalarabic' => "\x{FE84}", - 'alefhamzabelowarabic' => "\x{0625}", - 'alefhamzabelowfinalarabic' => "\x{FE88}", - 'alefhebrew' => "\x{05D0}", - 'aleflamedhebrew' => "\x{FB4F}", - 'alefmaddaabovearabic' => "\x{0622}", - 'alefmaddaabovefinalarabic' => "\x{FE82}", - 'alefmaksuraarabic' => "\x{0649}", - 'alefmaksurafinalarabic' => "\x{FEF0}", - 'alefmaksurainitialarabic' => "\x{FEF3}", - 'alefmaksuramedialarabic' => "\x{FEF4}", - 'alefpatahhebrew' => "\x{FB2E}", - 'alefqamatshebrew' => "\x{FB2F}", - 'allequal' => "\x{224C}", - 'amonospace' => "\x{FF41}", - 'ampersandmonospace' => "\x{FF06}", - 'ampersandsmall' => "\x{F726}", - 'amsquare' => "\x{33C2}", - 'anbopomofo' => "\x{3122}", - 'angbopomofo' => "\x{3124}", - 'angkhankhuthai' => "\x{0E5A}", - 'anglebracketleft' => "\x{3008}", - 'anglebracketleftvertical' => "\x{FE3F}", - 'anglebracketright' => "\x{3009}", - 'anglebracketrightvertical' => "\x{FE40}", - 'angstrom' => "\x{212B}", - 'anudattadeva' => "\x{0952}", - 'anusvarabengali' => "\x{0982}", - 'anusvaradeva' => "\x{0902}", - 'anusvaragujarati' => "\x{0A82}", - 'apaatosquare' => "\x{3300}", - 'aparen' => "\x{249C}", - 'apostrophearmenian' => "\x{055A}", - 'apostrophemod' => "\x{02BC}", - 'apple' => "\x{F8FF}", - 'approaches' => "\x{2250}", - 'approxequalorimage' => "\x{2252}", - 'approximatelyequal' => "\x{2245}", - 'araeaekorean' => "\x{318E}", - 'araeakorean' => "\x{318D}", - 'arc' => "\x{2312}", - 'arighthalfring' => "\x{1E9A}", - 'aringbelow' => "\x{1E01}", - 'arrowdashdown' => "\x{21E3}", - 'arrowdashleft' => "\x{21E0}", - 'arrowdashright' => "\x{21E2}", - 'arrowdashup' => "\x{21E1}", - 'arrowdownleft' => "\x{2199}", - 'arrowdownright' => "\x{2198}", - 'arrowdownwhite' => "\x{21E9}", - 'arrowheaddownmod' => "\x{02C5}", - 'arrowheadleftmod' => "\x{02C2}", - 'arrowheadrightmod' => "\x{02C3}", - 'arrowheadupmod' => "\x{02C4}", - 'arrowhorizex' => "\x{F8E7}", - 'arrowleftdbl' => "\x{21D0}", - 'arrowleftdblstroke' => "\x{21CD}", - 'arrowleftoverright' => "\x{21C6}", - 'arrowleftwhite' => "\x{21E6}", - 'arrowrightdblstroke' => "\x{21CF}", - 'arrowrightheavy' => "\x{279E}", - 'arrowrightoverleft' => "\x{21C4}", - 'arrowrightwhite' => "\x{21E8}", - 'arrowtableft' => "\x{21E4}", - 'arrowtabright' => "\x{21E5}", - 'arrowupdownbase' => "\x{21A8}", - 'arrowupleft' => "\x{2196}", - 'arrowupleftofdown' => "\x{21C5}", - 'arrowupright' => "\x{2197}", - 'arrowupwhite' => "\x{21E7}", - 'arrowvertex' => "\x{F8E6}", - 'asciicircummonospace' => "\x{FF3E}", - 'asciitildemonospace' => "\x{FF5E}", - 'ascript' => "\x{0251}", - 'ascriptturned' => "\x{0252}", - 'asmallhiragana' => "\x{3041}", - 'asmallkatakana' => "\x{30A1}", - 'asmallkatakanahalfwidth' => "\x{FF67}", - 'asteriskaltonearabic' => "\x{066D}", - 'asteriskarabic' => "\x{066D}", - 'asteriskmonospace' => "\x{FF0A}", - 'asterisksmall' => "\x{FE61}", - 'asterism' => "\x{2042}", - 'asuperior' => "\x{F6E9}", - 'asymptoticallyequal' => "\x{2243}", - 'atmonospace' => "\x{FF20}", - 'atsmall' => "\x{FE6B}", - 'aturned' => "\x{0250}", - 'aubengali' => "\x{0994}", - 'aubopomofo' => "\x{3120}", - 'audeva' => "\x{0914}", - 'augujarati' => "\x{0A94}", - 'augurmukhi' => "\x{0A14}", - 'aulengthmarkbengali' => "\x{09D7}", - 'aumatragurmukhi' => "\x{0A4C}", - 'auvowelsignbengali' => "\x{09CC}", - 'auvowelsigndeva' => "\x{094C}", - 'auvowelsigngujarati' => "\x{0ACC}", - 'avagrahadeva' => "\x{093D}", - 'aybarmenian' => "\x{0561}", - 'ayin' => "\x{05E2}", - 'ayinaltonehebrew' => "\x{FB20}", - 'ayinhebrew' => "\x{05E2}", - 'babengali' => "\x{09AC}", - 'backslashmonospace' => "\x{FF3C}", - 'badeva' => "\x{092C}", - 'bagujarati' => "\x{0AAC}", - 'bagurmukhi' => "\x{0A2C}", - 'bahiragana' => "\x{3070}", - 'bahtthai' => "\x{0E3F}", - 'bakatakana' => "\x{30D0}", - 'barmonospace' => "\x{FF5C}", - 'bbopomofo' => "\x{3105}", - 'bcircle' => "\x{24D1}", - 'bdotaccent' => "\x{1E03}", - 'bdotbelow' => "\x{1E05}", - 'beamedsixteenthnotes' => "\x{266C}", - 'because' => "\x{2235}", - 'becyrillic' => "\x{0431}", - 'beharabic' => "\x{0628}", - 'behfinalarabic' => "\x{FE90}", - 'behinitialarabic' => "\x{FE91}", - 'behiragana' => "\x{3079}", - 'behmedialarabic' => "\x{FE92}", - 'behmeeminitialarabic' => "\x{FC9F}", - 'behmeemisolatedarabic' => "\x{FC08}", - 'behnoonfinalarabic' => "\x{FC6D}", - 'bekatakana' => "\x{30D9}", - 'benarmenian' => "\x{0562}", - 'bet' => "\x{05D1}", - 'betasymbolgreek' => "\x{03D0}", - 'betdagesh' => "\x{FB31}", - 'betdageshhebrew' => "\x{FB31}", - 'bethebrew' => "\x{05D1}", - 'betrafehebrew' => "\x{FB4C}", - 'bhabengali' => "\x{09AD}", - 'bhadeva' => "\x{092D}", - 'bhagujarati' => "\x{0AAD}", - 'bhagurmukhi' => "\x{0A2D}", - 'bhook' => "\x{0253}", - 'bihiragana' => "\x{3073}", - 'bikatakana' => "\x{30D3}", - 'bilabialclick' => "\x{0298}", - 'bindigurmukhi' => "\x{0A02}", - 'birusquare' => "\x{3331}", - 'blackcircle' => "\x{25CF}", - 'blackdiamond' => "\x{25C6}", - 'blackdownpointingtriangle' => "\x{25BC}", - 'blackleftpointingpointer' => "\x{25C4}", - 'blackleftpointingtriangle' => "\x{25C0}", - 'blacklenticularbracketleft' => "\x{3010}", - 'blacklenticularbracketleftvertical' => "\x{FE3B}", - 'blacklenticularbracketright' => "\x{3011}", - 'blacklenticularbracketrightvertical' => "\x{FE3C}", - 'blacklowerlefttriangle' => "\x{25E3}", - 'blacklowerrighttriangle' => "\x{25E2}", - 'blackrectangle' => "\x{25AC}", - 'blackrightpointingpointer' => "\x{25BA}", - 'blackrightpointingtriangle' => "\x{25B6}", - 'blacksmallsquare' => "\x{25AA}", - 'blacksmilingface' => "\x{263B}", - 'blacksquare' => "\x{25A0}", - 'blackstar' => "\x{2605}", - 'blackupperlefttriangle' => "\x{25E4}", - 'blackupperrighttriangle' => "\x{25E5}", - 'blackuppointingsmalltriangle' => "\x{25B4}", - 'blackuppointingtriangle' => "\x{25B2}", - 'blank' => "\x{2423}", - 'blinebelow' => "\x{1E07}", - 'bmonospace' => "\x{FF42}", - 'bobaimaithai' => "\x{0E1A}", - 'bohiragana' => "\x{307C}", - 'bokatakana' => "\x{30DC}", - 'bparen' => "\x{249D}", - 'bqsquare' => "\x{33C3}", - 'braceex' => "\x{F8F4}", - 'braceleftbt' => "\x{F8F3}", - 'braceleftmid' => "\x{F8F2}", - 'braceleftmonospace' => "\x{FF5B}", - 'braceleftsmall' => "\x{FE5B}", - 'bracelefttp' => "\x{F8F1}", - 'braceleftvertical' => "\x{FE37}", - 'bracerightbt' => "\x{F8FE}", - 'bracerightmid' => "\x{F8FD}", - 'bracerightmonospace' => "\x{FF5D}", - 'bracerightsmall' => "\x{FE5C}", - 'bracerighttp' => "\x{F8FC}", - 'bracerightvertical' => "\x{FE38}", - 'bracketleftbt' => "\x{F8F0}", - 'bracketleftex' => "\x{F8EF}", - 'bracketleftmonospace' => "\x{FF3B}", - 'bracketlefttp' => "\x{F8EE}", - 'bracketrightbt' => "\x{F8FB}", - 'bracketrightex' => "\x{F8FA}", - 'bracketrightmonospace' => "\x{FF3D}", - 'bracketrighttp' => "\x{F8F9}", - 'brevebelowcmb' => "\x{032E}", - 'brevecmb' => "\x{0306}", - 'breveinvertedbelowcmb' => "\x{032F}", - 'breveinvertedcmb' => "\x{0311}", - 'breveinverteddoublecmb' => "\x{0361}", - 'bridgebelowcmb' => "\x{032A}", - 'bridgeinvertedbelowcmb' => "\x{033A}", - 'bstroke' => "\x{0180}", - 'bsuperior' => "\x{F6EA}", - 'btopbar' => "\x{0183}", - 'buhiragana' => "\x{3076}", - 'bukatakana' => "\x{30D6}", - 'bulletinverse' => "\x{25D8}", - 'bulletoperator' => "\x{2219}", - 'bullseye' => "\x{25CE}", - 'caarmenian' => "\x{056E}", - 'cabengali' => "\x{099A}", - 'cadeva' => "\x{091A}", - 'cagujarati' => "\x{0A9A}", - 'cagurmukhi' => "\x{0A1A}", - 'calsquare' => "\x{3388}", - 'candrabindubengali' => "\x{0981}", - 'candrabinducmb' => "\x{0310}", - 'candrabindudeva' => "\x{0901}", - 'candrabindugujarati' => "\x{0A81}", - 'capslock' => "\x{21EA}", - 'careof' => "\x{2105}", - 'caronbelowcmb' => "\x{032C}", - 'caroncmb' => "\x{030C}", - 'cbopomofo' => "\x{3118}", - 'ccedillaacute' => "\x{1E09}", - 'ccircle' => "\x{24D2}", - 'ccurl' => "\x{0255}", - 'cdot' => "\x{010B}", - 'cdsquare' => "\x{33C5}", - 'cedillacmb' => "\x{0327}", - 'centigrade' => "\x{2103}", - 'centinferior' => "\x{F6DF}", - 'centmonospace' => "\x{FFE0}", - 'centoldstyle' => "\x{F7A2}", - 'centsuperior' => "\x{F6E0}", - 'chaarmenian' => "\x{0579}", - 'chabengali' => "\x{099B}", - 'chadeva' => "\x{091B}", - 'chagujarati' => "\x{0A9B}", - 'chagurmukhi' => "\x{0A1B}", - 'chbopomofo' => "\x{3114}", - 'cheabkhasiancyrillic' => "\x{04BD}", - 'checkmark' => "\x{2713}", - 'checyrillic' => "\x{0447}", - 'chedescenderabkhasiancyrillic' => "\x{04BF}", - 'chedescendercyrillic' => "\x{04B7}", - 'chedieresiscyrillic' => "\x{04F5}", - 'cheharmenian' => "\x{0573}", - 'chekhakassiancyrillic' => "\x{04CC}", - 'cheverticalstrokecyrillic' => "\x{04B9}", - 'chieuchacirclekorean' => "\x{3277}", - 'chieuchaparenkorean' => "\x{3217}", - 'chieuchcirclekorean' => "\x{3269}", - 'chieuchkorean' => "\x{314A}", - 'chieuchparenkorean' => "\x{3209}", - 'chochangthai' => "\x{0E0A}", - 'chochanthai' => "\x{0E08}", - 'chochingthai' => "\x{0E09}", - 'chochoethai' => "\x{0E0C}", - 'chook' => "\x{0188}", - 'cieucacirclekorean' => "\x{3276}", - 'cieucaparenkorean' => "\x{3216}", - 'cieuccirclekorean' => "\x{3268}", - 'cieuckorean' => "\x{3148}", - 'cieucparenkorean' => "\x{3208}", - 'cieucuparenkorean' => "\x{321C}", - 'circleot' => "\x{2299}", # Actual Adobe glyph list entry -- identified as typo, May 2008 - 'circledot' => "\x{2299}", # What it should have been - 'circlepostalmark' => "\x{3036}", - 'circlewithlefthalfblack' => "\x{25D0}", - 'circlewithrighthalfblack' => "\x{25D1}", - 'circumflexbelowcmb' => "\x{032D}", - 'circumflexcmb' => "\x{0302}", - 'clear' => "\x{2327}", - 'clickalveolar' => "\x{01C2}", - 'clickdental' => "\x{01C0}", - 'clicklateral' => "\x{01C1}", - 'clickretroflex' => "\x{01C3}", - 'clubsuitblack' => "\x{2663}", - 'clubsuitwhite' => "\x{2667}", - 'cmcubedsquare' => "\x{33A4}", - 'cmonospace' => "\x{FF43}", - 'cmsquaredsquare' => "\x{33A0}", - 'coarmenian' => "\x{0581}", - 'colonmonospace' => "\x{FF1A}", - 'colonsign' => "\x{20A1}", - 'colonsmall' => "\x{FE55}", - 'colontriangularhalfmod' => "\x{02D1}", - 'colontriangularmod' => "\x{02D0}", - 'commaabovecmb' => "\x{0313}", - 'commaaboverightcmb' => "\x{0315}", - 'commaaccent' => "\x{F6C3}", - 'commaarabic' => "\x{060C}", - 'commaarmenian' => "\x{055D}", - 'commainferior' => "\x{F6E1}", - 'commamonospace' => "\x{FF0C}", - 'commareversedabovecmb' => "\x{0314}", - 'commareversedmod' => "\x{02BD}", - 'commasmall' => "\x{FE50}", - 'commasuperior' => "\x{F6E2}", - 'commaturnedabovecmb' => "\x{0312}", - 'commaturnedmod' => "\x{02BB}", - 'compass' => "\x{263C}", - 'contourintegral' => "\x{222E}", - 'control' => "\x{2303}", - 'controlACK' => "\x{0006}", - 'controlBEL' => "\x{0007}", - 'controlBS' => "\x{0008}", - 'controlCAN' => "\x{0018}", - 'controlCR' => "\x{000D}", - 'controlDC1' => "\x{0011}", - 'controlDC2' => "\x{0012}", - 'controlDC3' => "\x{0013}", - 'controlDC4' => "\x{0014}", - 'controlDEL' => "\x{007F}", - 'controlDLE' => "\x{0010}", - 'controlEM' => "\x{0019}", - 'controlENQ' => "\x{0005}", - 'controlEOT' => "\x{0004}", - 'controlESC' => "\x{001B}", - 'controlETB' => "\x{0017}", - 'controlETX' => "\x{0003}", - 'controlFF' => "\x{000C}", - 'controlFS' => "\x{001C}", - 'controlGS' => "\x{001D}", - 'controlHT' => "\x{0009}", - 'controlLF' => "\x{000A}", - 'controlNAK' => "\x{0015}", - 'controlRS' => "\x{001E}", - 'controlSI' => "\x{000F}", - 'controlSO' => "\x{000E}", - 'controlSOT' => "\x{0002}", - 'controlSTX' => "\x{0001}", - 'controlSUB' => "\x{001A}", - 'controlSYN' => "\x{0016}", - 'controlUS' => "\x{001F}", - 'controlVT' => "\x{000B}", - 'copyrightsans' => "\x{F8E9}", - 'copyrightserif' => "\x{F6D9}", - 'cornerbracketleft' => "\x{300C}", - 'cornerbracketlefthalfwidth' => "\x{FF62}", - 'cornerbracketleftvertical' => "\x{FE41}", - 'cornerbracketright' => "\x{300D}", - 'cornerbracketrighthalfwidth' => "\x{FF63}", - 'cornerbracketrightvertical' => "\x{FE42}", - 'corporationsquare' => "\x{337F}", - 'cosquare' => "\x{33C7}", - 'coverkgsquare' => "\x{33C6}", - 'cparen' => "\x{249E}", - 'cruzeiro' => "\x{20A2}", - 'cstretched' => "\x{0297}", - 'curlyand' => "\x{22CF}", - 'curlyor' => "\x{22CE}", - 'cyrBreve' => "\x{F6D1}", - 'cyrFlex' => "\x{F6D2}", - 'cyrbreve' => "\x{F6D4}", - 'cyrflex' => "\x{F6D5}", - 'daarmenian' => "\x{0564}", - 'dabengali' => "\x{09A6}", - 'dadarabic' => "\x{0636}", - 'dadeva' => "\x{0926}", - 'dadfinalarabic' => "\x{FEBE}", - 'dadinitialarabic' => "\x{FEBF}", - 'dadmedialarabic' => "\x{FEC0}", - 'dagesh' => "\x{05BC}", - 'dageshhebrew' => "\x{05BC}", - 'dagujarati' => "\x{0AA6}", - 'dagurmukhi' => "\x{0A26}", - 'dahiragana' => "\x{3060}", - 'dakatakana' => "\x{30C0}", - 'dalarabic' => "\x{062F}", - 'dalet' => "\x{05D3}", - 'daletdagesh' => "\x{FB33}", - 'daletdageshhebrew' => "\x{FB33}", - 'dalethatafpatah' => "\x{05D3}\x{05B2}", - 'dalethatafpatahhebrew' => "\x{05D3}\x{05B2}", - 'dalethatafsegol' => "\x{05D3}\x{05B1}", - 'dalethatafsegolhebrew' => "\x{05D3}\x{05B1}", - 'dalethebrew' => "\x{05D3}", - 'dalethiriq' => "\x{05D3}\x{05B4}", - 'dalethiriqhebrew' => "\x{05D3}\x{05B4}", - 'daletholam' => "\x{05D3}\x{05B9}", - 'daletholamhebrew' => "\x{05D3}\x{05B9}", - 'daletpatah' => "\x{05D3}\x{05B7}", - 'daletpatahhebrew' => "\x{05D3}\x{05B7}", - 'daletqamats' => "\x{05D3}\x{05B8}", - 'daletqamatshebrew' => "\x{05D3}\x{05B8}", - 'daletqubuts' => "\x{05D3}\x{05BB}", - 'daletqubutshebrew' => "\x{05D3}\x{05BB}", - 'daletsegol' => "\x{05D3}\x{05B6}", - 'daletsegolhebrew' => "\x{05D3}\x{05B6}", - 'daletsheva' => "\x{05D3}\x{05B0}", - 'daletshevahebrew' => "\x{05D3}\x{05B0}", - 'dalettsere' => "\x{05D3}\x{05B5}", - 'dalettserehebrew' => "\x{05D3}\x{05B5}", - 'dalfinalarabic' => "\x{FEAA}", - 'dammaarabic' => "\x{064F}", - 'dammalowarabic' => "\x{064F}", - 'dammatanaltonearabic' => "\x{064C}", - 'dammatanarabic' => "\x{064C}", - 'danda' => "\x{0964}", - 'dargahebrew' => "\x{05A7}", - 'dargalefthebrew' => "\x{05A7}", - 'dasiapneumatacyrilliccmb' => "\x{0485}", - 'dblGrave' => "\x{F6D3}", - 'dblanglebracketleft' => "\x{300A}", - 'dblanglebracketleftvertical' => "\x{FE3D}", - 'dblanglebracketright' => "\x{300B}", - 'dblanglebracketrightvertical' => "\x{FE3E}", - 'dblarchinvertedbelowcmb' => "\x{032B}", - 'dblarrowleft' => "\x{21D4}", - 'dblarrowright' => "\x{21D2}", - 'dbldanda' => "\x{0965}", - 'dblgrave' => "\x{F6D6}", - 'dblgravecmb' => "\x{030F}", - 'dblintegral' => "\x{222C}", - 'dbllowline' => "\x{2017}", - 'dbllowlinecmb' => "\x{0333}", - 'dbloverlinecmb' => "\x{033F}", - 'dblprimemod' => "\x{02BA}", - 'dblverticalbar' => "\x{2016}", - 'dblverticallineabovecmb' => "\x{030E}", - 'dbopomofo' => "\x{3109}", - 'dbsquare' => "\x{33C8}", - 'dcedilla' => "\x{1E11}", - 'dcircle' => "\x{24D3}", - 'dcircumflexbelow' => "\x{1E13}", - 'ddabengali' => "\x{09A1}", - 'ddadeva' => "\x{0921}", - 'ddagujarati' => "\x{0AA1}", - 'ddagurmukhi' => "\x{0A21}", - 'ddalarabic' => "\x{0688}", - 'ddalfinalarabic' => "\x{FB89}", - 'dddhadeva' => "\x{095C}", - 'ddhabengali' => "\x{09A2}", - 'ddhadeva' => "\x{0922}", - 'ddhagujarati' => "\x{0AA2}", - 'ddhagurmukhi' => "\x{0A22}", - 'ddotaccent' => "\x{1E0B}", - 'ddotbelow' => "\x{1E0D}", - 'decimalseparatorarabic' => "\x{066B}", - 'decimalseparatorpersian' => "\x{066B}", - 'decyrillic' => "\x{0434}", - 'dehihebrew' => "\x{05AD}", - 'dehiragana' => "\x{3067}", - 'deicoptic' => "\x{03EF}", - 'dekatakana' => "\x{30C7}", - 'deleteleft' => "\x{232B}", - 'deleteright' => "\x{2326}", - 'deltaturned' => "\x{018D}", - 'denominatorminusonenumeratorbengali' => "\x{09F8}", - 'dezh' => "\x{02A4}", - 'dhabengali' => "\x{09A7}", - 'dhadeva' => "\x{0927}", - 'dhagujarati' => "\x{0AA7}", - 'dhagurmukhi' => "\x{0A27}", - 'dhook' => "\x{0257}", - 'dialytikatonos' => "\x{0385}", - 'dialytikatonoscmb' => "\x{0344}", - 'diamondsuitwhite' => "\x{2662}", - 'dieresisacute' => "\x{F6D7}", - 'dieresisbelowcmb' => "\x{0324}", - 'dieresiscmb' => "\x{0308}", - 'dieresisgrave' => "\x{F6D8}", - 'dihiragana' => "\x{3062}", - 'dikatakana' => "\x{30C2}", - 'dittomark' => "\x{3003}", - 'divides' => "\x{2223}", - 'divisionslash' => "\x{2215}", - 'djecyrillic' => "\x{0452}", - 'dlinebelow' => "\x{1E0F}", - 'dlsquare' => "\x{3397}", - 'dmacron' => "\x{0111}", - 'dmonospace' => "\x{FF44}", - 'dochadathai' => "\x{0E0E}", - 'dodekthai' => "\x{0E14}", - 'dohiragana' => "\x{3069}", - 'dokatakana' => "\x{30C9}", - 'dollarinferior' => "\x{F6E3}", - 'dollarmonospace' => "\x{FF04}", - 'dollaroldstyle' => "\x{F724}", - 'dollarsmall' => "\x{FE69}", - 'dollarsuperior' => "\x{F6E4}", - 'dorusquare' => "\x{3326}", - 'dotaccentcmb' => "\x{0307}", - 'dotbelowcmb' => "\x{0323}", - 'dotkatakana' => "\x{30FB}", - 'dotlessj' => "\x{F6BE}", - 'dotlessjstrokehook' => "\x{0284}", - 'dottedcircle' => "\x{25CC}", - 'doubleyodpatah' => "\x{FB1F}", - 'doubleyodpatahhebrew' => "\x{FB1F}", - 'downtackbelowcmb' => "\x{031E}", - 'downtackmod' => "\x{02D5}", - 'dparen' => "\x{249F}", - 'dsuperior' => "\x{F6EB}", - 'dtail' => "\x{0256}", - 'dtopbar' => "\x{018C}", - 'duhiragana' => "\x{3065}", - 'dukatakana' => "\x{30C5}", - 'dz' => "\x{01F3}", - 'dzaltone' => "\x{02A3}", - 'dzcaron' => "\x{01C6}", - 'dzcurl' => "\x{02A5}", - 'dzeabkhasiancyrillic' => "\x{04E1}", - 'dzecyrillic' => "\x{0455}", - 'dzhecyrillic' => "\x{045F}", - 'earth' => "\x{2641}", - 'ebengali' => "\x{098F}", - 'ebopomofo' => "\x{311C}", - 'ecandradeva' => "\x{090D}", - 'ecandragujarati' => "\x{0A8D}", - 'ecandravowelsigndeva' => "\x{0945}", - 'ecandravowelsigngujarati' => "\x{0AC5}", - 'ecedillabreve' => "\x{1E1D}", - 'echarmenian' => "\x{0565}", - 'echyiwnarmenian' => "\x{0587}", - 'ecircle' => "\x{24D4}", - 'ecircumflexacute' => "\x{1EBF}", - 'ecircumflexbelow' => "\x{1E19}", - 'ecircumflexdotbelow' => "\x{1EC7}", - 'ecircumflexgrave' => "\x{1EC1}", - 'ecircumflexhookabove' => "\x{1EC3}", - 'ecircumflextilde' => "\x{1EC5}", - 'ecyrillic' => "\x{0454}", - 'edblgrave' => "\x{0205}", - 'edeva' => "\x{090F}", - 'edot' => "\x{0117}", - 'edotbelow' => "\x{1EB9}", - 'eegurmukhi' => "\x{0A0F}", - 'eematragurmukhi' => "\x{0A47}", - 'efcyrillic' => "\x{0444}", - 'egujarati' => "\x{0A8F}", - 'eharmenian' => "\x{0567}", - 'ehbopomofo' => "\x{311D}", - 'ehiragana' => "\x{3048}", - 'ehookabove' => "\x{1EBB}", - 'eibopomofo' => "\x{311F}", - 'eightarabic' => "\x{0668}", - 'eightbengali' => "\x{09EE}", - 'eightcircle' => "\x{2467}", - 'eightcircleinversesansserif' => "\x{2791}", - 'eightdeva' => "\x{096E}", - 'eighteencircle' => "\x{2471}", - 'eighteenparen' => "\x{2485}", - 'eighteenperiod' => "\x{2499}", - 'eightgujarati' => "\x{0AEE}", - 'eightgurmukhi' => "\x{0A6E}", - 'eighthackarabic' => "\x{0668}", - 'eighthangzhou' => "\x{3028}", - 'eighthnotebeamed' => "\x{266B}", - 'eightideographicparen' => "\x{3227}", - 'eightinferior' => "\x{2088}", - 'eightmonospace' => "\x{FF18}", - 'eightoldstyle' => "\x{F738}", - 'eightparen' => "\x{247B}", - 'eightperiod' => "\x{248F}", - 'eightpersian' => "\x{06F8}", - 'eightroman' => "\x{2177}", - 'eightsuperior' => "\x{2078}", - 'eightthai' => "\x{0E58}", - 'einvertedbreve' => "\x{0207}", - 'eiotifiedcyrillic' => "\x{0465}", - 'ekatakana' => "\x{30A8}", - 'ekatakanahalfwidth' => "\x{FF74}", - 'ekonkargurmukhi' => "\x{0A74}", - 'ekorean' => "\x{3154}", - 'elcyrillic' => "\x{043B}", - 'elevencircle' => "\x{246A}", - 'elevenparen' => "\x{247E}", - 'elevenperiod' => "\x{2492}", - 'elevenroman' => "\x{217A}", - 'ellipsisvertical' => "\x{22EE}", - 'emacronacute' => "\x{1E17}", - 'emacrongrave' => "\x{1E15}", - 'emcyrillic' => "\x{043C}", - 'emdashvertical' => "\x{FE31}", - 'emonospace' => "\x{FF45}", - 'emphasismarkarmenian' => "\x{055B}", - 'enbopomofo' => "\x{3123}", - 'encyrillic' => "\x{043D}", - 'endashvertical' => "\x{FE32}", - 'endescendercyrillic' => "\x{04A3}", - 'engbopomofo' => "\x{3125}", - 'enghecyrillic' => "\x{04A5}", - 'enhookcyrillic' => "\x{04C8}", - 'enspace' => "\x{2002}", - 'eokorean' => "\x{3153}", - 'eopen' => "\x{025B}", - 'eopenclosed' => "\x{029A}", - 'eopenreversed' => "\x{025C}", - 'eopenreversedclosed' => "\x{025E}", - 'eopenreversedhook' => "\x{025D}", - 'eparen' => "\x{24A0}", - 'equalmonospace' => "\x{FF1D}", - 'equalsmall' => "\x{FE66}", - 'equalsuperior' => "\x{207C}", - 'erbopomofo' => "\x{3126}", - 'ercyrillic' => "\x{0440}", - 'ereversed' => "\x{0258}", - 'ereversedcyrillic' => "\x{044D}", - 'escyrillic' => "\x{0441}", - 'esdescendercyrillic' => "\x{04AB}", - 'esh' => "\x{0283}", - 'eshcurl' => "\x{0286}", - 'eshortdeva' => "\x{090E}", - 'eshortvowelsigndeva' => "\x{0946}", - 'eshreversedloop' => "\x{01AA}", - 'eshsquatreversed' => "\x{0285}", - 'esmallhiragana' => "\x{3047}", - 'esmallkatakana' => "\x{30A7}", - 'esmallkatakanahalfwidth' => "\x{FF6A}", - 'esuperior' => "\x{F6EC}", - 'etarmenian' => "\x{0568}", - 'etilde' => "\x{1EBD}", - 'etildebelow' => "\x{1E1B}", - 'etnahtafoukhhebrew' => "\x{0591}", - 'etnahtafoukhlefthebrew' => "\x{0591}", - 'etnahtahebrew' => "\x{0591}", - 'etnahtalefthebrew' => "\x{0591}", - 'eturned' => "\x{01DD}", - 'eukorean' => "\x{3161}", - 'euro' => "\x{20AC}", - 'evowelsignbengali' => "\x{09C7}", - 'evowelsigndeva' => "\x{0947}", - 'evowelsigngujarati' => "\x{0AC7}", - 'exclamarmenian' => "\x{055C}", - 'exclamdownsmall' => "\x{F7A1}", - 'exclammonospace' => "\x{FF01}", - 'exclamsmall' => "\x{F721}", - 'ezh' => "\x{0292}", - 'ezhcaron' => "\x{01EF}", - 'ezhcurl' => "\x{0293}", - 'ezhreversed' => "\x{01B9}", - 'ezhtail' => "\x{01BA}", - 'fadeva' => "\x{095E}", - 'fagurmukhi' => "\x{0A5E}", - 'fahrenheit' => "\x{2109}", - 'fathaarabic' => "\x{064E}", - 'fathalowarabic' => "\x{064E}", - 'fathatanarabic' => "\x{064B}", - 'fbopomofo' => "\x{3108}", - 'fcircle' => "\x{24D5}", - 'fdotaccent' => "\x{1E1F}", - 'feharabic' => "\x{0641}", - 'feharmenian' => "\x{0586}", - 'fehfinalarabic' => "\x{FED2}", - 'fehinitialarabic' => "\x{FED3}", - 'fehmedialarabic' => "\x{FED4}", - 'feicoptic' => "\x{03E5}", - 'fifteencircle' => "\x{246E}", - 'fifteenparen' => "\x{2482}", - 'fifteenperiod' => "\x{2496}", - 'finalkaf' => "\x{05DA}", - 'finalkafdagesh' => "\x{FB3A}", - 'finalkafdageshhebrew' => "\x{FB3A}", - 'finalkafhebrew' => "\x{05DA}", - 'finalkafqamats' => "\x{05DA}\x{05B8}", - 'finalkafqamatshebrew' => "\x{05DA}\x{05B8}", - 'finalkafsheva' => "\x{05DA}\x{05B0}", - 'finalkafshevahebrew' => "\x{05DA}\x{05B0}", - 'finalmem' => "\x{05DD}", - 'finalmemhebrew' => "\x{05DD}", - 'finalnun' => "\x{05DF}", - 'finalnunhebrew' => "\x{05DF}", - 'finalpe' => "\x{05E3}", - 'finalpehebrew' => "\x{05E3}", - 'finaltsadi' => "\x{05E5}", - 'finaltsadihebrew' => "\x{05E5}", - 'firsttonechinese' => "\x{02C9}", - 'fisheye' => "\x{25C9}", - 'fitacyrillic' => "\x{0473}", - 'fivearabic' => "\x{0665}", - 'fivebengali' => "\x{09EB}", - 'fivecircle' => "\x{2464}", - 'fivecircleinversesansserif' => "\x{278E}", - 'fivedeva' => "\x{096B}", - 'fivegujarati' => "\x{0AEB}", - 'fivegurmukhi' => "\x{0A6B}", - 'fivehackarabic' => "\x{0665}", - 'fivehangzhou' => "\x{3025}", - 'fiveideographicparen' => "\x{3224}", - 'fiveinferior' => "\x{2085}", - 'fivemonospace' => "\x{FF15}", - 'fiveoldstyle' => "\x{F735}", - 'fiveparen' => "\x{2478}", - 'fiveperiod' => "\x{248C}", - 'fivepersian' => "\x{06F5}", - 'fiveroman' => "\x{2174}", - 'fivesuperior' => "\x{2075}", - 'fivethai' => "\x{0E55}", - 'fmonospace' => "\x{FF46}", - 'fmsquare' => "\x{3399}", - 'fofanthai' => "\x{0E1F}", - 'fofathai' => "\x{0E1D}", - 'fongmanthai' => "\x{0E4F}", - 'forall' => "\x{2200}", - 'fourarabic' => "\x{0664}", - 'fourbengali' => "\x{09EA}", - 'fourcircle' => "\x{2463}", - 'fourcircleinversesansserif' => "\x{278D}", - 'fourdeva' => "\x{096A}", - 'fourgujarati' => "\x{0AEA}", - 'fourgurmukhi' => "\x{0A6A}", - 'fourhackarabic' => "\x{0664}", - 'fourhangzhou' => "\x{3024}", - 'fourideographicparen' => "\x{3223}", - 'fourinferior' => "\x{2084}", - 'fourmonospace' => "\x{FF14}", - 'fournumeratorbengali' => "\x{09F7}", - 'fouroldstyle' => "\x{F734}", - 'fourparen' => "\x{2477}", - 'fourperiod' => "\x{248B}", - 'fourpersian' => "\x{06F4}", - 'fourroman' => "\x{2173}", - 'foursuperior' => "\x{2074}", - 'fourteencircle' => "\x{246D}", - 'fourteenparen' => "\x{2481}", - 'fourteenperiod' => "\x{2495}", - 'fourthai' => "\x{0E54}", - 'fourthtonechinese' => "\x{02CB}", - 'fparen' => "\x{24A1}", - 'gabengali' => "\x{0997}", - 'gacute' => "\x{01F5}", - 'gadeva' => "\x{0917}", - 'gafarabic' => "\x{06AF}", - 'gaffinalarabic' => "\x{FB93}", - 'gafinitialarabic' => "\x{FB94}", - 'gafmedialarabic' => "\x{FB95}", - 'gagujarati' => "\x{0A97}", - 'gagurmukhi' => "\x{0A17}", - 'gahiragana' => "\x{304C}", - 'gakatakana' => "\x{30AC}", - 'gammalatinsmall' => "\x{0263}", - 'gammasuperior' => "\x{02E0}", - 'gangiacoptic' => "\x{03EB}", - 'gbopomofo' => "\x{310D}", - 'gcedilla' => "\x{0123}", - 'gcircle' => "\x{24D6}", - 'gdot' => "\x{0121}", - 'gecyrillic' => "\x{0433}", - 'gehiragana' => "\x{3052}", - 'gekatakana' => "\x{30B2}", - 'geometricallyequal' => "\x{2251}", - 'gereshaccenthebrew' => "\x{059C}", - 'gereshhebrew' => "\x{05F3}", - 'gereshmuqdamhebrew' => "\x{059D}", - 'gershayimaccenthebrew' => "\x{059E}", - 'gershayimhebrew' => "\x{05F4}", - 'getamark' => "\x{3013}", - 'ghabengali' => "\x{0998}", - 'ghadarmenian' => "\x{0572}", - 'ghadeva' => "\x{0918}", - 'ghagujarati' => "\x{0A98}", - 'ghagurmukhi' => "\x{0A18}", - 'ghainarabic' => "\x{063A}", - 'ghainfinalarabic' => "\x{FECE}", - 'ghaininitialarabic' => "\x{FECF}", - 'ghainmedialarabic' => "\x{FED0}", - 'ghemiddlehookcyrillic' => "\x{0495}", - 'ghestrokecyrillic' => "\x{0493}", - 'gheupturncyrillic' => "\x{0491}", - 'ghhadeva' => "\x{095A}", - 'ghhagurmukhi' => "\x{0A5A}", - 'ghook' => "\x{0260}", - 'ghzsquare' => "\x{3393}", - 'gihiragana' => "\x{304E}", - 'gikatakana' => "\x{30AE}", - 'gimarmenian' => "\x{0563}", - 'gimel' => "\x{05D2}", - 'gimeldagesh' => "\x{FB32}", - 'gimeldageshhebrew' => "\x{FB32}", - 'gimelhebrew' => "\x{05D2}", - 'gjecyrillic' => "\x{0453}", - 'glottalinvertedstroke' => "\x{01BE}", - 'glottalstop' => "\x{0294}", - 'glottalstopinverted' => "\x{0296}", - 'glottalstopmod' => "\x{02C0}", - 'glottalstopreversed' => "\x{0295}", - 'glottalstopreversedmod' => "\x{02C1}", - 'glottalstopreversedsuperior' => "\x{02E4}", - 'glottalstopstroke' => "\x{02A1}", - 'glottalstopstrokereversed' => "\x{02A2}", - 'gmacron' => "\x{1E21}", - 'gmonospace' => "\x{FF47}", - 'gohiragana' => "\x{3054}", - 'gokatakana' => "\x{30B4}", - 'gparen' => "\x{24A2}", - 'gpasquare' => "\x{33AC}", - 'gravebelowcmb' => "\x{0316}", - 'gravecmb' => "\x{0300}", - 'gravedeva' => "\x{0953}", - 'gravelowmod' => "\x{02CE}", - 'gravemonospace' => "\x{FF40}", - 'gravetonecmb' => "\x{0340}", - 'greaterequalorless' => "\x{22DB}", - 'greatermonospace' => "\x{FF1E}", - 'greaterorequivalent' => "\x{2273}", - 'greaterorless' => "\x{2277}", - 'greateroverequal' => "\x{2267}", - 'greatersmall' => "\x{FE65}", - 'gscript' => "\x{0261}", - 'gstroke' => "\x{01E5}", - 'guhiragana' => "\x{3050}", - 'gukatakana' => "\x{30B0}", - 'guramusquare' => "\x{3318}", - 'gysquare' => "\x{33C9}", - 'haabkhasiancyrillic' => "\x{04A9}", - 'haaltonearabic' => "\x{06C1}", - 'habengali' => "\x{09B9}", - 'hadescendercyrillic' => "\x{04B3}", - 'hadeva' => "\x{0939}", - 'hagujarati' => "\x{0AB9}", - 'hagurmukhi' => "\x{0A39}", - 'haharabic' => "\x{062D}", - 'hahfinalarabic' => "\x{FEA2}", - 'hahinitialarabic' => "\x{FEA3}", - 'hahiragana' => "\x{306F}", - 'hahmedialarabic' => "\x{FEA4}", - 'haitusquare' => "\x{332A}", - 'hakatakana' => "\x{30CF}", - 'hakatakanahalfwidth' => "\x{FF8A}", - 'halantgurmukhi' => "\x{0A4D}", - 'hamzaarabic' => "\x{0621}", - 'hamzadammaarabic' => "\x{0621}\x{064F}", - 'hamzadammatanarabic' => "\x{0621}\x{064C}", - 'hamzafathaarabic' => "\x{0621}\x{064E}", - 'hamzafathatanarabic' => "\x{0621}\x{064B}", - 'hamzalowarabic' => "\x{0621}", - 'hamzalowkasraarabic' => "\x{0621}\x{0650}", - 'hamzalowkasratanarabic' => "\x{0621}\x{064D}", - 'hamzasukunarabic' => "\x{0621}\x{0652}", - 'hangulfiller' => "\x{3164}", - 'hardsigncyrillic' => "\x{044A}", - 'harpoonleftbarbup' => "\x{21BC}", - 'harpoonrightbarbup' => "\x{21C0}", - 'hasquare' => "\x{33CA}", - 'hatafpatah' => "\x{05B2}", - 'hatafpatah16' => "\x{05B2}", - 'hatafpatah23' => "\x{05B2}", - 'hatafpatah2f' => "\x{05B2}", - 'hatafpatahhebrew' => "\x{05B2}", - 'hatafpatahnarrowhebrew' => "\x{05B2}", - 'hatafpatahquarterhebrew' => "\x{05B2}", - 'hatafpatahwidehebrew' => "\x{05B2}", - 'hatafqamats' => "\x{05B3}", - 'hatafqamats1b' => "\x{05B3}", - 'hatafqamats28' => "\x{05B3}", - 'hatafqamats34' => "\x{05B3}", - 'hatafqamatshebrew' => "\x{05B3}", - 'hatafqamatsnarrowhebrew' => "\x{05B3}", - 'hatafqamatsquarterhebrew' => "\x{05B3}", - 'hatafqamatswidehebrew' => "\x{05B3}", - 'hatafsegol' => "\x{05B1}", - 'hatafsegol17' => "\x{05B1}", - 'hatafsegol24' => "\x{05B1}", - 'hatafsegol30' => "\x{05B1}", - 'hatafsegolhebrew' => "\x{05B1}", - 'hatafsegolnarrowhebrew' => "\x{05B1}", - 'hatafsegolquarterhebrew' => "\x{05B1}", - 'hatafsegolwidehebrew' => "\x{05B1}", - 'hbopomofo' => "\x{310F}", - 'hbrevebelow' => "\x{1E2B}", - 'hcedilla' => "\x{1E29}", - 'hcircle' => "\x{24D7}", - 'hdieresis' => "\x{1E27}", - 'hdotaccent' => "\x{1E23}", - 'hdotbelow' => "\x{1E25}", - 'he' => "\x{05D4}", - 'heartsuitblack' => "\x{2665}", - 'heartsuitwhite' => "\x{2661}", - 'hedagesh' => "\x{FB34}", - 'hedageshhebrew' => "\x{FB34}", - 'hehaltonearabic' => "\x{06C1}", - 'heharabic' => "\x{0647}", - 'hehebrew' => "\x{05D4}", - 'hehfinalaltonearabic' => "\x{FBA7}", - 'hehfinalalttwoarabic' => "\x{FEEA}", - 'hehfinalarabic' => "\x{FEEA}", - 'hehhamzaabovefinalarabic' => "\x{FBA5}", - 'hehhamzaaboveisolatedarabic' => "\x{FBA4}", - 'hehinitialaltonearabic' => "\x{FBA8}", - 'hehinitialarabic' => "\x{FEEB}", - 'hehiragana' => "\x{3078}", - 'hehmedialaltonearabic' => "\x{FBA9}", - 'hehmedialarabic' => "\x{FEEC}", - 'heiseierasquare' => "\x{337B}", - 'hekatakana' => "\x{30D8}", - 'hekatakanahalfwidth' => "\x{FF8D}", - 'hekutaarusquare' => "\x{3336}", - 'henghook' => "\x{0267}", - 'herutusquare' => "\x{3339}", - 'het' => "\x{05D7}", - 'hethebrew' => "\x{05D7}", - 'hhook' => "\x{0266}", - 'hhooksuperior' => "\x{02B1}", - 'hieuhacirclekorean' => "\x{327B}", - 'hieuhaparenkorean' => "\x{321B}", - 'hieuhcirclekorean' => "\x{326D}", - 'hieuhkorean' => "\x{314E}", - 'hieuhparenkorean' => "\x{320D}", - 'hihiragana' => "\x{3072}", - 'hikatakana' => "\x{30D2}", - 'hikatakanahalfwidth' => "\x{FF8B}", - 'hiriq' => "\x{05B4}", - 'hiriq14' => "\x{05B4}", - 'hiriq21' => "\x{05B4}", - 'hiriq2d' => "\x{05B4}", - 'hiriqhebrew' => "\x{05B4}", - 'hiriqnarrowhebrew' => "\x{05B4}", - 'hiriqquarterhebrew' => "\x{05B4}", - 'hiriqwidehebrew' => "\x{05B4}", - 'hlinebelow' => "\x{1E96}", - 'hmonospace' => "\x{FF48}", - 'hoarmenian' => "\x{0570}", - 'hohipthai' => "\x{0E2B}", - 'hohiragana' => "\x{307B}", - 'hokatakana' => "\x{30DB}", - 'hokatakanahalfwidth' => "\x{FF8E}", - 'holam' => "\x{05B9}", - 'holam19' => "\x{05B9}", - 'holam26' => "\x{05B9}", - 'holam32' => "\x{05B9}", - 'holamhebrew' => "\x{05B9}", - 'holamnarrowhebrew' => "\x{05B9}", - 'holamquarterhebrew' => "\x{05B9}", - 'holamwidehebrew' => "\x{05B9}", - 'honokhukthai' => "\x{0E2E}", - 'hookcmb' => "\x{0309}", - 'hookpalatalizedbelowcmb' => "\x{0321}", - 'hookretroflexbelowcmb' => "\x{0322}", - 'hoonsquare' => "\x{3342}", - 'horicoptic' => "\x{03E9}", - 'horizontalbar' => "\x{2015}", - 'horncmb' => "\x{031B}", - 'hotsprings' => "\x{2668}", - 'hparen' => "\x{24A3}", - 'hsuperior' => "\x{02B0}", - 'hturned' => "\x{0265}", - 'huhiragana' => "\x{3075}", - 'huiitosquare' => "\x{3333}", - 'hukatakana' => "\x{30D5}", - 'hukatakanahalfwidth' => "\x{FF8C}", - 'hungarumlautcmb' => "\x{030B}", - 'hv' => "\x{0195}", - 'hypheninferior' => "\x{F6E5}", - 'hyphenmonospace' => "\x{FF0D}", - 'hyphensmall' => "\x{FE63}", - 'hyphensuperior' => "\x{F6E6}", - 'hyphentwo' => "\x{2010}", - 'iacyrillic' => "\x{044F}", - 'ibengali' => "\x{0987}", - 'ibopomofo' => "\x{3127}", - 'icaron' => "\x{01D0}", - 'icircle' => "\x{24D8}", - 'icyrillic' => "\x{0456}", - 'idblgrave' => "\x{0209}", - 'ideographearthcircle' => "\x{328F}", - 'ideographfirecircle' => "\x{328B}", - 'ideographicallianceparen' => "\x{323F}", - 'ideographiccallparen' => "\x{323A}", - 'ideographiccentrecircle' => "\x{32A5}", - 'ideographicclose' => "\x{3006}", - 'ideographiccomma' => "\x{3001}", - 'ideographiccommaleft' => "\x{FF64}", - 'ideographiccongratulationparen' => "\x{3237}", - 'ideographiccorrectcircle' => "\x{32A3}", - 'ideographicearthparen' => "\x{322F}", - 'ideographicenterpriseparen' => "\x{323D}", - 'ideographicexcellentcircle' => "\x{329D}", - 'ideographicfestivalparen' => "\x{3240}", - 'ideographicfinancialcircle' => "\x{3296}", - 'ideographicfinancialparen' => "\x{3236}", - 'ideographicfireparen' => "\x{322B}", - 'ideographichaveparen' => "\x{3232}", - 'ideographichighcircle' => "\x{32A4}", - 'ideographiciterationmark' => "\x{3005}", - 'ideographiclaborcircle' => "\x{3298}", - 'ideographiclaborparen' => "\x{3238}", - 'ideographicleftcircle' => "\x{32A7}", - 'ideographiclowcircle' => "\x{32A6}", - 'ideographicmedicinecircle' => "\x{32A9}", - 'ideographicmetalparen' => "\x{322E}", - 'ideographicmoonparen' => "\x{322A}", - 'ideographicnameparen' => "\x{3234}", - 'ideographicperiod' => "\x{3002}", - 'ideographicprintcircle' => "\x{329E}", - 'ideographicreachparen' => "\x{3243}", - 'ideographicrepresentparen' => "\x{3239}", - 'ideographicresourceparen' => "\x{323E}", - 'ideographicrightcircle' => "\x{32A8}", - 'ideographicsecretcircle' => "\x{3299}", - 'ideographicselfparen' => "\x{3242}", - 'ideographicsocietyparen' => "\x{3233}", - 'ideographicspace' => "\x{3000}", - 'ideographicspecialparen' => "\x{3235}", - 'ideographicstockparen' => "\x{3231}", - 'ideographicstudyparen' => "\x{323B}", - 'ideographicsunparen' => "\x{3230}", - 'ideographicsuperviseparen' => "\x{323C}", - 'ideographicwaterparen' => "\x{322C}", - 'ideographicwoodparen' => "\x{322D}", - 'ideographiczero' => "\x{3007}", - 'ideographmetalcircle' => "\x{328E}", - 'ideographmooncircle' => "\x{328A}", - 'ideographnamecircle' => "\x{3294}", - 'ideographsuncircle' => "\x{3290}", - 'ideographwatercircle' => "\x{328C}", - 'ideographwoodcircle' => "\x{328D}", - 'ideva' => "\x{0907}", - 'idieresisacute' => "\x{1E2F}", - 'idieresiscyrillic' => "\x{04E5}", - 'idotbelow' => "\x{1ECB}", - 'iebrevecyrillic' => "\x{04D7}", - 'iecyrillic' => "\x{0435}", - 'ieungacirclekorean' => "\x{3275}", - 'ieungaparenkorean' => "\x{3215}", - 'ieungcirclekorean' => "\x{3267}", - 'ieungkorean' => "\x{3147}", - 'ieungparenkorean' => "\x{3207}", - 'igujarati' => "\x{0A87}", - 'igurmukhi' => "\x{0A07}", - 'ihiragana' => "\x{3044}", - 'ihookabove' => "\x{1EC9}", - 'iibengali' => "\x{0988}", - 'iicyrillic' => "\x{0438}", - 'iideva' => "\x{0908}", - 'iigujarati' => "\x{0A88}", - 'iigurmukhi' => "\x{0A08}", - 'iimatragurmukhi' => "\x{0A40}", - 'iinvertedbreve' => "\x{020B}", - 'iishortcyrillic' => "\x{0439}", - 'iivowelsignbengali' => "\x{09C0}", - 'iivowelsigndeva' => "\x{0940}", - 'iivowelsigngujarati' => "\x{0AC0}", - 'ikatakana' => "\x{30A4}", - 'ikatakanahalfwidth' => "\x{FF72}", - 'ikorean' => "\x{3163}", - 'ilde' => "\x{02DC}", - 'iluyhebrew' => "\x{05AC}", - 'imacroncyrillic' => "\x{04E3}", - 'imageorapproximatelyequal' => "\x{2253}", - 'imatragurmukhi' => "\x{0A3F}", - 'imonospace' => "\x{FF49}", - 'increment' => "\x{2206}", - 'iniarmenian' => "\x{056B}", - 'integralbottom' => "\x{2321}", - 'integralex' => "\x{F8F5}", - 'integraltop' => "\x{2320}", - 'intisquare' => "\x{3305}", - 'iocyrillic' => "\x{0451}", - 'iotalatin' => "\x{0269}", - 'iparen' => "\x{24A4}", - 'irigurmukhi' => "\x{0A72}", - 'ismallhiragana' => "\x{3043}", - 'ismallkatakana' => "\x{30A3}", - 'ismallkatakanahalfwidth' => "\x{FF68}", - 'issharbengali' => "\x{09FA}", - 'istroke' => "\x{0268}", - 'isuperior' => "\x{F6ED}", - 'iterationhiragana' => "\x{309D}", - 'iterationkatakana' => "\x{30FD}", - 'itildebelow' => "\x{1E2D}", - 'iubopomofo' => "\x{3129}", - 'iucyrillic' => "\x{044E}", - 'ivowelsignbengali' => "\x{09BF}", - 'ivowelsigndeva' => "\x{093F}", - 'ivowelsigngujarati' => "\x{0ABF}", - 'izhitsacyrillic' => "\x{0475}", - 'izhitsadblgravecyrillic' => "\x{0477}", - 'jaarmenian' => "\x{0571}", - 'jabengali' => "\x{099C}", - 'jadeva' => "\x{091C}", - 'jagujarati' => "\x{0A9C}", - 'jagurmukhi' => "\x{0A1C}", - 'jbopomofo' => "\x{3110}", - 'jcaron' => "\x{01F0}", - 'jcircle' => "\x{24D9}", - 'jcrossedtail' => "\x{029D}", - 'jdotlessstroke' => "\x{025F}", - 'jecyrillic' => "\x{0458}", - 'jeemarabic' => "\x{062C}", - 'jeemfinalarabic' => "\x{FE9E}", - 'jeeminitialarabic' => "\x{FE9F}", - 'jeemmedialarabic' => "\x{FEA0}", - 'jeharabic' => "\x{0698}", - 'jehfinalarabic' => "\x{FB8B}", - 'jhabengali' => "\x{099D}", - 'jhadeva' => "\x{091D}", - 'jhagujarati' => "\x{0A9D}", - 'jhagurmukhi' => "\x{0A1D}", - 'jheharmenian' => "\x{057B}", - 'jis' => "\x{3004}", - 'jmonospace' => "\x{FF4A}", - 'jparen' => "\x{24A5}", - 'jsuperior' => "\x{02B2}", - 'kabashkircyrillic' => "\x{04A1}", - 'kabengali' => "\x{0995}", - 'kacute' => "\x{1E31}", - 'kacyrillic' => "\x{043A}", - 'kadescendercyrillic' => "\x{049B}", - 'kadeva' => "\x{0915}", - 'kaf' => "\x{05DB}", - 'kafarabic' => "\x{0643}", - 'kafdagesh' => "\x{FB3B}", - 'kafdageshhebrew' => "\x{FB3B}", - 'kaffinalarabic' => "\x{FEDA}", - 'kafhebrew' => "\x{05DB}", - 'kafinitialarabic' => "\x{FEDB}", - 'kafmedialarabic' => "\x{FEDC}", - 'kafrafehebrew' => "\x{FB4D}", - 'kagujarati' => "\x{0A95}", - 'kagurmukhi' => "\x{0A15}", - 'kahiragana' => "\x{304B}", - 'kahookcyrillic' => "\x{04C4}", - 'kakatakana' => "\x{30AB}", - 'kakatakanahalfwidth' => "\x{FF76}", - 'kappasymbolgreek' => "\x{03F0}", - 'kapyeounmieumkorean' => "\x{3171}", - 'kapyeounphieuphkorean' => "\x{3184}", - 'kapyeounpieupkorean' => "\x{3178}", - 'kapyeounssangpieupkorean' => "\x{3179}", - 'karoriisquare' => "\x{330D}", - 'kashidaautoarabic' => "\x{0640}", - 'kashidaautonosidebearingarabic' => "\x{0640}", - 'kasmallkatakana' => "\x{30F5}", - 'kasquare' => "\x{3384}", - 'kasraarabic' => "\x{0650}", - 'kasratanarabic' => "\x{064D}", - 'kastrokecyrillic' => "\x{049F}", - 'katahiraprolongmarkhalfwidth' => "\x{FF70}", - 'kaverticalstrokecyrillic' => "\x{049D}", - 'kbopomofo' => "\x{310E}", - 'kcalsquare' => "\x{3389}", - 'kcaron' => "\x{01E9}", - 'kcedilla' => "\x{0137}", - 'kcircle' => "\x{24DA}", - 'kdotbelow' => "\x{1E33}", - 'keharmenian' => "\x{0584}", - 'kehiragana' => "\x{3051}", - 'kekatakana' => "\x{30B1}", - 'kekatakanahalfwidth' => "\x{FF79}", - 'kenarmenian' => "\x{056F}", - 'kesmallkatakana' => "\x{30F6}", - 'khabengali' => "\x{0996}", - 'khacyrillic' => "\x{0445}", - 'khadeva' => "\x{0916}", - 'khagujarati' => "\x{0A96}", - 'khagurmukhi' => "\x{0A16}", - 'khaharabic' => "\x{062E}", - 'khahfinalarabic' => "\x{FEA6}", - 'khahinitialarabic' => "\x{FEA7}", - 'khahmedialarabic' => "\x{FEA8}", - 'kheicoptic' => "\x{03E7}", - 'khhadeva' => "\x{0959}", - 'khhagurmukhi' => "\x{0A59}", - 'khieukhacirclekorean' => "\x{3278}", - 'khieukhaparenkorean' => "\x{3218}", - 'khieukhcirclekorean' => "\x{326A}", - 'khieukhkorean' => "\x{314B}", - 'khieukhparenkorean' => "\x{320A}", - 'khokhaithai' => "\x{0E02}", - 'khokhonthai' => "\x{0E05}", - 'khokhuatthai' => "\x{0E03}", - 'khokhwaithai' => "\x{0E04}", - 'khomutthai' => "\x{0E5B}", - 'khook' => "\x{0199}", - 'khorakhangthai' => "\x{0E06}", - 'khzsquare' => "\x{3391}", - 'kihiragana' => "\x{304D}", - 'kikatakana' => "\x{30AD}", - 'kikatakanahalfwidth' => "\x{FF77}", - 'kiroguramusquare' => "\x{3315}", - 'kiromeetorusquare' => "\x{3316}", - 'kirosquare' => "\x{3314}", - 'kiyeokacirclekorean' => "\x{326E}", - 'kiyeokaparenkorean' => "\x{320E}", - 'kiyeokcirclekorean' => "\x{3260}", - 'kiyeokkorean' => "\x{3131}", - 'kiyeokparenkorean' => "\x{3200}", - 'kiyeoksioskorean' => "\x{3133}", - 'kjecyrillic' => "\x{045C}", - 'klinebelow' => "\x{1E35}", - 'klsquare' => "\x{3398}", - 'kmcubedsquare' => "\x{33A6}", - 'kmonospace' => "\x{FF4B}", - 'kmsquaredsquare' => "\x{33A2}", - 'kohiragana' => "\x{3053}", - 'kohmsquare' => "\x{33C0}", - 'kokaithai' => "\x{0E01}", - 'kokatakana' => "\x{30B3}", - 'kokatakanahalfwidth' => "\x{FF7A}", - 'kooposquare' => "\x{331E}", - 'koppacyrillic' => "\x{0481}", - 'koreanstandardsymbol' => "\x{327F}", - 'koroniscmb' => "\x{0343}", - 'kparen' => "\x{24A6}", - 'kpasquare' => "\x{33AA}", - 'ksicyrillic' => "\x{046F}", - 'ktsquare' => "\x{33CF}", - 'kturned' => "\x{029E}", - 'kuhiragana' => "\x{304F}", - 'kukatakana' => "\x{30AF}", - 'kukatakanahalfwidth' => "\x{FF78}", - 'kvsquare' => "\x{33B8}", - 'kwsquare' => "\x{33BE}", - 'labengali' => "\x{09B2}", - 'ladeva' => "\x{0932}", - 'lagujarati' => "\x{0AB2}", - 'lagurmukhi' => "\x{0A32}", - 'lakkhangyaothai' => "\x{0E45}", - 'lamaleffinalarabic' => "\x{FEFC}", - 'lamalefhamzaabovefinalarabic' => "\x{FEF8}", - 'lamalefhamzaaboveisolatedarabic' => "\x{FEF7}", - 'lamalefhamzabelowfinalarabic' => "\x{FEFA}", - 'lamalefhamzabelowisolatedarabic' => "\x{FEF9}", - 'lamalefisolatedarabic' => "\x{FEFB}", - 'lamalefmaddaabovefinalarabic' => "\x{FEF6}", - 'lamalefmaddaaboveisolatedarabic' => "\x{FEF5}", - 'lamarabic' => "\x{0644}", - 'lambdastroke' => "\x{019B}", - 'lamed' => "\x{05DC}", - 'lameddagesh' => "\x{FB3C}", - 'lameddageshhebrew' => "\x{FB3C}", - 'lamedhebrew' => "\x{05DC}", - 'lamedholam' => "\x{05DC}\x{05B9}", - 'lamedholamdagesh' => "\x{05DC}\x{05B9}\x{05BC}", - 'lamedholamdageshhebrew' => "\x{05DC}\x{05B9}\x{05BC}", - 'lamedholamhebrew' => "\x{05DC}\x{05B9}", - 'lamfinalarabic' => "\x{FEDE}", - 'lamhahinitialarabic' => "\x{FCCA}", - 'laminitialarabic' => "\x{FEDF}", - 'lamjeeminitialarabic' => "\x{FCC9}", - 'lamkhahinitialarabic' => "\x{FCCB}", - 'lamlamhehisolatedarabic' => "\x{FDF2}", - 'lammedialarabic' => "\x{FEE0}", - 'lammeemhahinitialarabic' => "\x{FD88}", - 'lammeeminitialarabic' => "\x{FCCC}", - 'lammeemjeeminitialarabic' => "\x{FEDF}\x{FEE4}\x{FEA0}", - 'lammeemkhahinitialarabic' => "\x{FEDF}\x{FEE4}\x{FEA8}", - 'largecircle' => "\x{25EF}", - 'lbar' => "\x{019A}", - 'lbelt' => "\x{026C}", - 'lbopomofo' => "\x{310C}", - 'lcedilla' => "\x{013C}", - 'lcircle' => "\x{24DB}", - 'lcircumflexbelow' => "\x{1E3D}", - 'ldotaccent' => "\x{0140}", - 'ldotbelow' => "\x{1E37}", - 'ldotbelowmacron' => "\x{1E39}", - 'leftangleabovecmb' => "\x{031A}", - 'lefttackbelowcmb' => "\x{0318}", - 'lessequalorgreater' => "\x{22DA}", - 'lessmonospace' => "\x{FF1C}", - 'lessorequivalent' => "\x{2272}", - 'lessorgreater' => "\x{2276}", - 'lessoverequal' => "\x{2266}", - 'lesssmall' => "\x{FE64}", - 'lezh' => "\x{026E}", - 'lhookretroflex' => "\x{026D}", - 'liwnarmenian' => "\x{056C}", - 'lj' => "\x{01C9}", - 'ljecyrillic' => "\x{0459}", - 'll' => "\x{F6C0}", - 'lladeva' => "\x{0933}", - 'llagujarati' => "\x{0AB3}", - 'llinebelow' => "\x{1E3B}", - 'llladeva' => "\x{0934}", - 'llvocalicbengali' => "\x{09E1}", - 'llvocalicdeva' => "\x{0961}", - 'llvocalicvowelsignbengali' => "\x{09E3}", - 'llvocalicvowelsigndeva' => "\x{0963}", - 'lmiddletilde' => "\x{026B}", - 'lmonospace' => "\x{FF4C}", - 'lmsquare' => "\x{33D0}", - 'lochulathai' => "\x{0E2C}", - 'logicalnotreversed' => "\x{2310}", - 'lolingthai' => "\x{0E25}", - 'lowlinecenterline' => "\x{FE4E}", - 'lowlinecmb' => "\x{0332}", - 'lowlinedashed' => "\x{FE4D}", - 'lparen' => "\x{24A7}", - 'lsquare' => "\x{2113}", - 'lsuperior' => "\x{F6EE}", - 'luthai' => "\x{0E26}", - 'lvocalicbengali' => "\x{098C}", - 'lvocalicdeva' => "\x{090C}", - 'lvocalicvowelsignbengali' => "\x{09E2}", - 'lvocalicvowelsigndeva' => "\x{0962}", - 'lxsquare' => "\x{33D3}", - 'mabengali' => "\x{09AE}", - 'macronbelowcmb' => "\x{0331}", - 'macroncmb' => "\x{0304}", - 'macronlowmod' => "\x{02CD}", - 'macronmonospace' => "\x{FFE3}", - 'macute' => "\x{1E3F}", - 'madeva' => "\x{092E}", - 'magujarati' => "\x{0AAE}", - 'magurmukhi' => "\x{0A2E}", - 'mahapakhhebrew' => "\x{05A4}", - 'mahapakhlefthebrew' => "\x{05A4}", - 'mahiragana' => "\x{307E}", - 'maichattawalowleftthai' => "\x{F895}", - 'maichattawalowrightthai' => "\x{F894}", - 'maichattawathai' => "\x{0E4B}", - 'maichattawaupperleftthai' => "\x{F893}", - 'maieklowleftthai' => "\x{F88C}", - 'maieklowrightthai' => "\x{F88B}", - 'maiekthai' => "\x{0E48}", - 'maiekupperleftthai' => "\x{F88A}", - 'maihanakatleftthai' => "\x{F884}", - 'maihanakatthai' => "\x{0E31}", - 'maitaikhuleftthai' => "\x{F889}", - 'maitaikhuthai' => "\x{0E47}", - 'maitholowleftthai' => "\x{F88F}", - 'maitholowrightthai' => "\x{F88E}", - 'maithothai' => "\x{0E49}", - 'maithoupperleftthai' => "\x{F88D}", - 'maitrilowleftthai' => "\x{F892}", - 'maitrilowrightthai' => "\x{F891}", - 'maitrithai' => "\x{0E4A}", - 'maitriupperleftthai' => "\x{F890}", - 'maiyamokthai' => "\x{0E46}", - 'makatakana' => "\x{30DE}", - 'makatakanahalfwidth' => "\x{FF8F}", - 'mansyonsquare' => "\x{3347}", - 'maqafhebrew' => "\x{05BE}", - 'mars' => "\x{2642}", - 'masoracirclehebrew' => "\x{05AF}", - 'masquare' => "\x{3383}", - 'mbopomofo' => "\x{3107}", - 'mbsquare' => "\x{33D4}", - 'mcircle' => "\x{24DC}", - 'mcubedsquare' => "\x{33A5}", - 'mdotaccent' => "\x{1E41}", - 'mdotbelow' => "\x{1E43}", - 'meemarabic' => "\x{0645}", - 'meemfinalarabic' => "\x{FEE2}", - 'meeminitialarabic' => "\x{FEE3}", - 'meemmedialarabic' => "\x{FEE4}", - 'meemmeeminitialarabic' => "\x{FCD1}", - 'meemmeemisolatedarabic' => "\x{FC48}", - 'meetorusquare' => "\x{334D}", - 'mehiragana' => "\x{3081}", - 'meizierasquare' => "\x{337E}", - 'mekatakana' => "\x{30E1}", - 'mekatakanahalfwidth' => "\x{FF92}", - 'mem' => "\x{05DE}", - 'memdagesh' => "\x{FB3E}", - 'memdageshhebrew' => "\x{FB3E}", - 'memhebrew' => "\x{05DE}", - 'menarmenian' => "\x{0574}", - 'merkhahebrew' => "\x{05A5}", - 'merkhakefulahebrew' => "\x{05A6}", - 'merkhakefulalefthebrew' => "\x{05A6}", - 'merkhalefthebrew' => "\x{05A5}", - 'mhook' => "\x{0271}", - 'mhzsquare' => "\x{3392}", - 'middledotkatakanahalfwidth' => "\x{FF65}", - 'middot' => "\x{00B7}", - 'mieumacirclekorean' => "\x{3272}", - 'mieumaparenkorean' => "\x{3212}", - 'mieumcirclekorean' => "\x{3264}", - 'mieumkorean' => "\x{3141}", - 'mieumpansioskorean' => "\x{3170}", - 'mieumparenkorean' => "\x{3204}", - 'mieumpieupkorean' => "\x{316E}", - 'mieumsioskorean' => "\x{316F}", - 'mihiragana' => "\x{307F}", - 'mikatakana' => "\x{30DF}", - 'mikatakanahalfwidth' => "\x{FF90}", - 'minusbelowcmb' => "\x{0320}", - 'minuscircle' => "\x{2296}", - 'minusmod' => "\x{02D7}", - 'minusplus' => "\x{2213}", - 'miribaarusquare' => "\x{334A}", - 'mirisquare' => "\x{3349}", - 'mlonglegturned' => "\x{0270}", - 'mlsquare' => "\x{3396}", - 'mmcubedsquare' => "\x{33A3}", - 'mmonospace' => "\x{FF4D}", - 'mmsquaredsquare' => "\x{339F}", - 'mohiragana' => "\x{3082}", - 'mohmsquare' => "\x{33C1}", - 'mokatakana' => "\x{30E2}", - 'mokatakanahalfwidth' => "\x{FF93}", - 'molsquare' => "\x{33D6}", - 'momathai' => "\x{0E21}", - 'moverssquare' => "\x{33A7}", - 'moverssquaredsquare' => "\x{33A8}", - 'mparen' => "\x{24A8}", - 'mpasquare' => "\x{33AB}", - 'mssquare' => "\x{33B3}", - 'msuperior' => "\x{F6EF}", - 'mturned' => "\x{026F}", - 'mu1' => "\x{00B5}", - 'muasquare' => "\x{3382}", - 'muchgreater' => "\x{226B}", - 'muchless' => "\x{226A}", - 'mufsquare' => "\x{338C}", - 'mugreek' => "\x{03BC}", - 'mugsquare' => "\x{338D}", - 'muhiragana' => "\x{3080}", - 'mukatakana' => "\x{30E0}", - 'mukatakanahalfwidth' => "\x{FF91}", - 'mulsquare' => "\x{3395}", - 'mumsquare' => "\x{339B}", - 'munahhebrew' => "\x{05A3}", - 'munahlefthebrew' => "\x{05A3}", - 'musicflatsign' => "\x{266D}", - 'musicsharpsign' => "\x{266F}", - 'mussquare' => "\x{33B2}", - 'muvsquare' => "\x{33B6}", - 'muwsquare' => "\x{33BC}", - 'mvmegasquare' => "\x{33B9}", - 'mvsquare' => "\x{33B7}", - 'mwmegasquare' => "\x{33BF}", - 'mwsquare' => "\x{33BD}", - 'nabengali' => "\x{09A8}", - 'nabla' => "\x{2207}", - 'nadeva' => "\x{0928}", - 'nagujarati' => "\x{0AA8}", - 'nagurmukhi' => "\x{0A28}", - 'nahiragana' => "\x{306A}", - 'nakatakana' => "\x{30CA}", - 'nakatakanahalfwidth' => "\x{FF85}", - 'nasquare' => "\x{3381}", - 'nbopomofo' => "\x{310B}", - 'nbspace' => "\x{00A0}", - 'ncedilla' => "\x{0146}", - 'ncircle' => "\x{24DD}", - 'ncircumflexbelow' => "\x{1E4B}", - 'ndotaccent' => "\x{1E45}", - 'ndotbelow' => "\x{1E47}", - 'nehiragana' => "\x{306D}", - 'nekatakana' => "\x{30CD}", - 'nekatakanahalfwidth' => "\x{FF88}", - 'newsheqelsign' => "\x{20AA}", - 'nfsquare' => "\x{338B}", - 'ngabengali' => "\x{0999}", - 'ngadeva' => "\x{0919}", - 'ngagujarati' => "\x{0A99}", - 'ngagurmukhi' => "\x{0A19}", - 'ngonguthai' => "\x{0E07}", - 'nhiragana' => "\x{3093}", - 'nhookleft' => "\x{0272}", - 'nhookretroflex' => "\x{0273}", - 'nieunacirclekorean' => "\x{326F}", - 'nieunaparenkorean' => "\x{320F}", - 'nieuncieuckorean' => "\x{3135}", - 'nieuncirclekorean' => "\x{3261}", - 'nieunhieuhkorean' => "\x{3136}", - 'nieunkorean' => "\x{3134}", - 'nieunpansioskorean' => "\x{3168}", - 'nieunparenkorean' => "\x{3201}", - 'nieunsioskorean' => "\x{3167}", - 'nieuntikeutkorean' => "\x{3166}", - 'nihiragana' => "\x{306B}", - 'nikatakana' => "\x{30CB}", - 'nikatakanahalfwidth' => "\x{FF86}", - 'nikhahitleftthai' => "\x{F899}", - 'nikhahitthai' => "\x{0E4D}", - 'ninearabic' => "\x{0669}", - 'ninebengali' => "\x{09EF}", - 'ninecircle' => "\x{2468}", - 'ninecircleinversesansserif' => "\x{2792}", - 'ninedeva' => "\x{096F}", - 'ninegujarati' => "\x{0AEF}", - 'ninegurmukhi' => "\x{0A6F}", - 'ninehackarabic' => "\x{0669}", - 'ninehangzhou' => "\x{3029}", - 'nineideographicparen' => "\x{3228}", - 'nineinferior' => "\x{2089}", - 'ninemonospace' => "\x{FF19}", - 'nineoldstyle' => "\x{F739}", - 'nineparen' => "\x{247C}", - 'nineperiod' => "\x{2490}", - 'ninepersian' => "\x{06F9}", - 'nineroman' => "\x{2178}", - 'ninesuperior' => "\x{2079}", - 'nineteencircle' => "\x{2472}", - 'nineteenparen' => "\x{2486}", - 'nineteenperiod' => "\x{249A}", - 'ninethai' => "\x{0E59}", - 'nj' => "\x{01CC}", - 'njecyrillic' => "\x{045A}", - 'nkatakana' => "\x{30F3}", - 'nkatakanahalfwidth' => "\x{FF9D}", - 'nlegrightlong' => "\x{019E}", - 'nlinebelow' => "\x{1E49}", - 'nmonospace' => "\x{FF4E}", - 'nmsquare' => "\x{339A}", - 'nnabengali' => "\x{09A3}", - 'nnadeva' => "\x{0923}", - 'nnagujarati' => "\x{0AA3}", - 'nnagurmukhi' => "\x{0A23}", - 'nnnadeva' => "\x{0929}", - 'nohiragana' => "\x{306E}", - 'nokatakana' => "\x{30CE}", - 'nokatakanahalfwidth' => "\x{FF89}", - 'nonbreakingspace' => "\x{00A0}", - 'nonenthai' => "\x{0E13}", - 'nonuthai' => "\x{0E19}", - 'noonarabic' => "\x{0646}", - 'noonfinalarabic' => "\x{FEE6}", - 'noonghunnaarabic' => "\x{06BA}", - 'noonghunnafinalarabic' => "\x{FB9F}", - 'noonhehinitialarabic' => "\x{FEE7}\x{FEEC}", - 'nooninitialarabic' => "\x{FEE7}", - 'noonjeeminitialarabic' => "\x{FCD2}", - 'noonjeemisolatedarabic' => "\x{FC4B}", - 'noonmedialarabic' => "\x{FEE8}", - 'noonmeeminitialarabic' => "\x{FCD5}", - 'noonmeemisolatedarabic' => "\x{FC4E}", - 'noonnoonfinalarabic' => "\x{FC8D}", - 'notcontains' => "\x{220C}", - 'notelementof' => "\x{2209}", - 'notgreater' => "\x{226F}", - 'notgreaternorequal' => "\x{2271}", - 'notgreaternorless' => "\x{2279}", - 'notidentical' => "\x{2262}", - 'notless' => "\x{226E}", - 'notlessnorequal' => "\x{2270}", - 'notparallel' => "\x{2226}", - 'notprecedes' => "\x{2280}", - 'notsucceeds' => "\x{2281}", - 'notsuperset' => "\x{2285}", - 'nowarmenian' => "\x{0576}", - 'nparen' => "\x{24A9}", - 'nssquare' => "\x{33B1}", - 'nsuperior' => "\x{207F}", - 'nuhiragana' => "\x{306C}", - 'nukatakana' => "\x{30CC}", - 'nukatakanahalfwidth' => "\x{FF87}", - 'nuktabengali' => "\x{09BC}", - 'nuktadeva' => "\x{093C}", - 'nuktagujarati' => "\x{0ABC}", - 'nuktagurmukhi' => "\x{0A3C}", - 'numbersignmonospace' => "\x{FF03}", - 'numbersignsmall' => "\x{FE5F}", - 'numeralsigngreek' => "\x{0374}", - 'numeralsignlowergreek' => "\x{0375}", - 'numero' => "\x{2116}", - 'nun' => "\x{05E0}", - 'nundagesh' => "\x{FB40}", - 'nundageshhebrew' => "\x{FB40}", - 'nunhebrew' => "\x{05E0}", - 'nvsquare' => "\x{33B5}", - 'nwsquare' => "\x{33BB}", - 'nyabengali' => "\x{099E}", - 'nyadeva' => "\x{091E}", - 'nyagujarati' => "\x{0A9E}", - 'nyagurmukhi' => "\x{0A1E}", - 'oangthai' => "\x{0E2D}", - 'obarred' => "\x{0275}", - 'obarredcyrillic' => "\x{04E9}", - 'obarreddieresiscyrillic' => "\x{04EB}", - 'obengali' => "\x{0993}", - 'obopomofo' => "\x{311B}", - 'ocandradeva' => "\x{0911}", - 'ocandragujarati' => "\x{0A91}", - 'ocandravowelsigndeva' => "\x{0949}", - 'ocandravowelsigngujarati' => "\x{0AC9}", - 'ocaron' => "\x{01D2}", - 'ocircle' => "\x{24DE}", - 'ocircumflexacute' => "\x{1ED1}", - 'ocircumflexdotbelow' => "\x{1ED9}", - 'ocircumflexgrave' => "\x{1ED3}", - 'ocircumflexhookabove' => "\x{1ED5}", - 'ocircumflextilde' => "\x{1ED7}", - 'ocyrillic' => "\x{043E}", - 'odblacute' => "\x{0151}", - 'odblgrave' => "\x{020D}", - 'odeva' => "\x{0913}", - 'odieresiscyrillic' => "\x{04E7}", - 'odotbelow' => "\x{1ECD}", - 'oekorean' => "\x{315A}", - 'ogonekcmb' => "\x{0328}", - 'ogujarati' => "\x{0A93}", - 'oharmenian' => "\x{0585}", - 'ohiragana' => "\x{304A}", - 'ohookabove' => "\x{1ECF}", - 'ohornacute' => "\x{1EDB}", - 'ohorndotbelow' => "\x{1EE3}", - 'ohorngrave' => "\x{1EDD}", - 'ohornhookabove' => "\x{1EDF}", - 'ohorntilde' => "\x{1EE1}", - 'oi' => "\x{01A3}", - 'oinvertedbreve' => "\x{020F}", - 'okatakana' => "\x{30AA}", - 'okatakanahalfwidth' => "\x{FF75}", - 'okorean' => "\x{3157}", - 'olehebrew' => "\x{05AB}", - 'omacronacute' => "\x{1E53}", - 'omacrongrave' => "\x{1E51}", - 'omdeva' => "\x{0950}", - 'omegacyrillic' => "\x{0461}", - 'omegalatinclosed' => "\x{0277}", - 'omegaroundcyrillic' => "\x{047B}", - 'omegatitlocyrillic' => "\x{047D}", - 'omgujarati' => "\x{0AD0}", - 'omonospace' => "\x{FF4F}", - 'onearabic' => "\x{0661}", - 'onebengali' => "\x{09E7}", - 'onecircle' => "\x{2460}", - 'onecircleinversesansserif' => "\x{278A}", - 'onedeva' => "\x{0967}", - 'onefitted' => "\x{F6DC}", - 'onegujarati' => "\x{0AE7}", - 'onegurmukhi' => "\x{0A67}", - 'onehackarabic' => "\x{0661}", - 'onehangzhou' => "\x{3021}", - 'oneideographicparen' => "\x{3220}", - 'oneinferior' => "\x{2081}", - 'onemonospace' => "\x{FF11}", - 'onenumeratorbengali' => "\x{09F4}", - 'oneoldstyle' => "\x{F731}", - 'oneparen' => "\x{2474}", - 'oneperiod' => "\x{2488}", - 'onepersian' => "\x{06F1}", - 'oneroman' => "\x{2170}", - 'onethai' => "\x{0E51}", - 'oogonek' => "\x{01EB}", - 'oogonekmacron' => "\x{01ED}", - 'oogurmukhi' => "\x{0A13}", - 'oomatragurmukhi' => "\x{0A4B}", - 'oopen' => "\x{0254}", - 'oparen' => "\x{24AA}", - 'option' => "\x{2325}", - 'oshortdeva' => "\x{0912}", - 'oshortvowelsigndeva' => "\x{094A}", - 'osmallhiragana' => "\x{3049}", - 'osmallkatakana' => "\x{30A9}", - 'osmallkatakanahalfwidth' => "\x{FF6B}", - 'ostrokeacute' => "\x{01FF}", - 'osuperior' => "\x{F6F0}", - 'otcyrillic' => "\x{047F}", - 'otildeacute' => "\x{1E4D}", - 'otildedieresis' => "\x{1E4F}", - 'oubopomofo' => "\x{3121}", - 'overline' => "\x{203E}", - 'overlinecenterline' => "\x{FE4A}", - 'overlinecmb' => "\x{0305}", - 'overlinedashed' => "\x{FE49}", - 'overlinedblwavy' => "\x{FE4C}", - 'overlinewavy' => "\x{FE4B}", - 'overscore' => "\x{00AF}", - 'ovowelsignbengali' => "\x{09CB}", - 'ovowelsigndeva' => "\x{094B}", - 'ovowelsigngujarati' => "\x{0ACB}", - 'paampssquare' => "\x{3380}", - 'paasentosquare' => "\x{332B}", - 'pabengali' => "\x{09AA}", - 'pacute' => "\x{1E55}", - 'padeva' => "\x{092A}", - 'pagedown' => "\x{21DF}", - 'pageup' => "\x{21DE}", - 'pagujarati' => "\x{0AAA}", - 'pagurmukhi' => "\x{0A2A}", - 'pahiragana' => "\x{3071}", - 'paiyannoithai' => "\x{0E2F}", - 'pakatakana' => "\x{30D1}", - 'palatalizationcyrilliccmb' => "\x{0484}", - 'palochkacyrillic' => "\x{04C0}", - 'pansioskorean' => "\x{317F}", - 'parallel' => "\x{2225}", - 'parenleftaltonearabic' => "\x{FD3E}", - 'parenleftbt' => "\x{F8ED}", - 'parenleftex' => "\x{F8EC}", - 'parenleftinferior' => "\x{208D}", - 'parenleftmonospace' => "\x{FF08}", - 'parenleftsmall' => "\x{FE59}", - 'parenleftsuperior' => "\x{207D}", - 'parenlefttp' => "\x{F8EB}", - 'parenleftvertical' => "\x{FE35}", - 'parenrightaltonearabic' => "\x{FD3F}", - 'parenrightbt' => "\x{F8F8}", - 'parenrightex' => "\x{F8F7}", - 'parenrightinferior' => "\x{208E}", - 'parenrightmonospace' => "\x{FF09}", - 'parenrightsmall' => "\x{FE5A}", - 'parenrightsuperior' => "\x{207E}", - 'parenrighttp' => "\x{F8F6}", - 'parenrightvertical' => "\x{FE36}", - 'paseqhebrew' => "\x{05C0}", - 'pashtahebrew' => "\x{0599}", - 'pasquare' => "\x{33A9}", - 'patah' => "\x{05B7}", - 'patah11' => "\x{05B7}", - 'patah1d' => "\x{05B7}", - 'patah2a' => "\x{05B7}", - 'patahhebrew' => "\x{05B7}", - 'patahnarrowhebrew' => "\x{05B7}", - 'patahquarterhebrew' => "\x{05B7}", - 'patahwidehebrew' => "\x{05B7}", - 'pazerhebrew' => "\x{05A1}", - 'pbopomofo' => "\x{3106}", - 'pcircle' => "\x{24DF}", - 'pdotaccent' => "\x{1E57}", - 'pe' => "\x{05E4}", - 'pecyrillic' => "\x{043F}", - 'pedagesh' => "\x{FB44}", - 'pedageshhebrew' => "\x{FB44}", - 'peezisquare' => "\x{333B}", - 'pefinaldageshhebrew' => "\x{FB43}", - 'peharabic' => "\x{067E}", - 'peharmenian' => "\x{057A}", - 'pehebrew' => "\x{05E4}", - 'pehfinalarabic' => "\x{FB57}", - 'pehinitialarabic' => "\x{FB58}", - 'pehiragana' => "\x{307A}", - 'pehmedialarabic' => "\x{FB59}", - 'pekatakana' => "\x{30DA}", - 'pemiddlehookcyrillic' => "\x{04A7}", - 'perafehebrew' => "\x{FB4E}", - 'percentarabic' => "\x{066A}", - 'percentmonospace' => "\x{FF05}", - 'percentsmall' => "\x{FE6A}", - 'periodarmenian' => "\x{0589}", - 'periodhalfwidth' => "\x{FF61}", - 'periodinferior' => "\x{F6E7}", - 'periodmonospace' => "\x{FF0E}", - 'periodsmall' => "\x{FE52}", - 'periodsuperior' => "\x{F6E8}", - 'perispomenigreekcmb' => "\x{0342}", - 'pfsquare' => "\x{338A}", - 'phabengali' => "\x{09AB}", - 'phadeva' => "\x{092B}", - 'phagujarati' => "\x{0AAB}", - 'phagurmukhi' => "\x{0A2B}", - 'phieuphacirclekorean' => "\x{327A}", - 'phieuphaparenkorean' => "\x{321A}", - 'phieuphcirclekorean' => "\x{326C}", - 'phieuphkorean' => "\x{314D}", - 'phieuphparenkorean' => "\x{320C}", - 'philatin' => "\x{0278}", - 'phinthuthai' => "\x{0E3A}", - 'phisymbolgreek' => "\x{03D5}", - 'phook' => "\x{01A5}", - 'phophanthai' => "\x{0E1E}", - 'phophungthai' => "\x{0E1C}", - 'phosamphaothai' => "\x{0E20}", - 'pieupacirclekorean' => "\x{3273}", - 'pieupaparenkorean' => "\x{3213}", - 'pieupcieuckorean' => "\x{3176}", - 'pieupcirclekorean' => "\x{3265}", - 'pieupkiyeokkorean' => "\x{3172}", - 'pieupkorean' => "\x{3142}", - 'pieupparenkorean' => "\x{3205}", - 'pieupsioskiyeokkorean' => "\x{3174}", - 'pieupsioskorean' => "\x{3144}", - 'pieupsiostikeutkorean' => "\x{3175}", - 'pieupthieuthkorean' => "\x{3177}", - 'pieuptikeutkorean' => "\x{3173}", - 'pihiragana' => "\x{3074}", - 'pikatakana' => "\x{30D4}", - 'pisymbolgreek' => "\x{03D6}", - 'piwrarmenian' => "\x{0583}", - 'plusbelowcmb' => "\x{031F}", - 'pluscircle' => "\x{2295}", - 'plusmod' => "\x{02D6}", - 'plusmonospace' => "\x{FF0B}", - 'plussmall' => "\x{FE62}", - 'plussuperior' => "\x{207A}", - 'pmonospace' => "\x{FF50}", - 'pmsquare' => "\x{33D8}", - 'pohiragana' => "\x{307D}", - 'pointingindexdownwhite' => "\x{261F}", - 'pointingindexleftwhite' => "\x{261C}", - 'pointingindexrightwhite' => "\x{261E}", - 'pointingindexupwhite' => "\x{261D}", - 'pokatakana' => "\x{30DD}", - 'poplathai' => "\x{0E1B}", - 'postalmark' => "\x{3012}", - 'postalmarkface' => "\x{3020}", - 'pparen' => "\x{24AB}", - 'precedes' => "\x{227A}", - 'primemod' => "\x{02B9}", - 'primereversed' => "\x{2035}", - 'projective' => "\x{2305}", - 'prolongedkana' => "\x{30FC}", - 'propellor' => "\x{2318}", - 'proportion' => "\x{2237}", - 'psicyrillic' => "\x{0471}", - 'psilipneumatacyrilliccmb' => "\x{0486}", - 'pssquare' => "\x{33B0}", - 'puhiragana' => "\x{3077}", - 'pukatakana' => "\x{30D7}", - 'pvsquare' => "\x{33B4}", - 'pwsquare' => "\x{33BA}", - 'qadeva' => "\x{0958}", - 'qadmahebrew' => "\x{05A8}", - 'qafarabic' => "\x{0642}", - 'qaffinalarabic' => "\x{FED6}", - 'qafinitialarabic' => "\x{FED7}", - 'qafmedialarabic' => "\x{FED8}", - 'qamats' => "\x{05B8}", - 'qamats10' => "\x{05B8}", - 'qamats1a' => "\x{05B8}", - 'qamats1c' => "\x{05B8}", - 'qamats27' => "\x{05B8}", - 'qamats29' => "\x{05B8}", - 'qamats33' => "\x{05B8}", - 'qamatsde' => "\x{05B8}", - 'qamatshebrew' => "\x{05B8}", - 'qamatsnarrowhebrew' => "\x{05B8}", - 'qamatsqatanhebrew' => "\x{05B8}", - 'qamatsqatannarrowhebrew' => "\x{05B8}", - 'qamatsqatanquarterhebrew' => "\x{05B8}", - 'qamatsqatanwidehebrew' => "\x{05B8}", - 'qamatsquarterhebrew' => "\x{05B8}", - 'qamatswidehebrew' => "\x{05B8}", - 'qarneyparahebrew' => "\x{059F}", - 'qbopomofo' => "\x{3111}", - 'qcircle' => "\x{24E0}", - 'qhook' => "\x{02A0}", - 'qmonospace' => "\x{FF51}", - 'qof' => "\x{05E7}", - 'qofdagesh' => "\x{FB47}", - 'qofdageshhebrew' => "\x{FB47}", - 'qofhatafpatah' => "\x{05E7}\x{05B2}", - 'qofhatafpatahhebrew' => "\x{05E7}\x{05B2}", - 'qofhatafsegol' => "\x{05E7}\x{05B1}", - 'qofhatafsegolhebrew' => "\x{05E7}\x{05B1}", - 'qofhebrew' => "\x{05E7}", - 'qofhiriq' => "\x{05E7}\x{05B4}", - 'qofhiriqhebrew' => "\x{05E7}\x{05B4}", - 'qofholam' => "\x{05E7}\x{05B9}", - 'qofholamhebrew' => "\x{05E7}\x{05B9}", - 'qofpatah' => "\x{05E7}\x{05B7}", - 'qofpatahhebrew' => "\x{05E7}\x{05B7}", - 'qofqamats' => "\x{05E7}\x{05B8}", - 'qofqamatshebrew' => "\x{05E7}\x{05B8}", - 'qofqubuts' => "\x{05E7}\x{05BB}", - 'qofqubutshebrew' => "\x{05E7}\x{05BB}", - 'qofsegol' => "\x{05E7}\x{05B6}", - 'qofsegolhebrew' => "\x{05E7}\x{05B6}", - 'qofsheva' => "\x{05E7}\x{05B0}", - 'qofshevahebrew' => "\x{05E7}\x{05B0}", - 'qoftsere' => "\x{05E7}\x{05B5}", - 'qoftserehebrew' => "\x{05E7}\x{05B5}", - 'qparen' => "\x{24AC}", - 'quarternote' => "\x{2669}", - 'qubuts' => "\x{05BB}", - 'qubuts18' => "\x{05BB}", - 'qubuts25' => "\x{05BB}", - 'qubuts31' => "\x{05BB}", - 'qubutshebrew' => "\x{05BB}", - 'qubutsnarrowhebrew' => "\x{05BB}", - 'qubutsquarterhebrew' => "\x{05BB}", - 'qubutswidehebrew' => "\x{05BB}", - 'questionarabic' => "\x{061F}", - 'questionarmenian' => "\x{055E}", - 'questiondownsmall' => "\x{F7BF}", - 'questiongreek' => "\x{037E}", - 'questionmonospace' => "\x{FF1F}", - 'questionsmall' => "\x{F73F}", - 'quotedblmonospace' => "\x{FF02}", - 'quotedblprime' => "\x{301E}", - 'quotedblprimereversed' => "\x{301D}", - 'quoteleftreversed' => "\x{201B}", - 'quoterightn' => "\x{0149}", - 'quotesinglemonospace' => "\x{FF07}", - 'raarmenian' => "\x{057C}", - 'rabengali' => "\x{09B0}", - 'radeva' => "\x{0930}", - 'radicalex' => "\x{F8E5}", - 'radoverssquare' => "\x{33AE}", - 'radoverssquaredsquare' => "\x{33AF}", - 'radsquare' => "\x{33AD}", - 'rafe' => "\x{05BF}", - 'rafehebrew' => "\x{05BF}", - 'ragujarati' => "\x{0AB0}", - 'ragurmukhi' => "\x{0A30}", - 'rahiragana' => "\x{3089}", - 'rakatakana' => "\x{30E9}", - 'rakatakanahalfwidth' => "\x{FF97}", - 'ralowerdiagonalbengali' => "\x{09F1}", - 'ramiddlediagonalbengali' => "\x{09F0}", - 'ramshorn' => "\x{0264}", - 'ratio' => "\x{2236}", - 'rbopomofo' => "\x{3116}", - 'rcedilla' => "\x{0157}", - 'rcircle' => "\x{24E1}", - 'rdblgrave' => "\x{0211}", - 'rdotaccent' => "\x{1E59}", - 'rdotbelow' => "\x{1E5B}", - 'rdotbelowmacron' => "\x{1E5D}", - 'referencemark' => "\x{203B}", - 'registersans' => "\x{F8E8}", - 'registerserif' => "\x{F6DA}", - 'reharabic' => "\x{0631}", - 'reharmenian' => "\x{0580}", - 'rehfinalarabic' => "\x{FEAE}", - 'rehiragana' => "\x{308C}", - 'rehyehaleflamarabic' => "\x{0631}\x{FEF3}\x{FE8E}\x{0644}", - 'rekatakana' => "\x{30EC}", - 'rekatakanahalfwidth' => "\x{FF9A}", - 'resh' => "\x{05E8}", - 'reshdageshhebrew' => "\x{FB48}", - 'reshhatafpatah' => "\x{05E8}\x{05B2}", - 'reshhatafpatahhebrew' => "\x{05E8}\x{05B2}", - 'reshhatafsegol' => "\x{05E8}\x{05B1}", - 'reshhatafsegolhebrew' => "\x{05E8}\x{05B1}", - 'reshhebrew' => "\x{05E8}", - 'reshhiriq' => "\x{05E8}\x{05B4}", - 'reshhiriqhebrew' => "\x{05E8}\x{05B4}", - 'reshholam' => "\x{05E8}\x{05B9}", - 'reshholamhebrew' => "\x{05E8}\x{05B9}", - 'reshpatah' => "\x{05E8}\x{05B7}", - 'reshpatahhebrew' => "\x{05E8}\x{05B7}", - 'reshqamats' => "\x{05E8}\x{05B8}", - 'reshqamatshebrew' => "\x{05E8}\x{05B8}", - 'reshqubuts' => "\x{05E8}\x{05BB}", - 'reshqubutshebrew' => "\x{05E8}\x{05BB}", - 'reshsegol' => "\x{05E8}\x{05B6}", - 'reshsegolhebrew' => "\x{05E8}\x{05B6}", - 'reshsheva' => "\x{05E8}\x{05B0}", - 'reshshevahebrew' => "\x{05E8}\x{05B0}", - 'reshtsere' => "\x{05E8}\x{05B5}", - 'reshtserehebrew' => "\x{05E8}\x{05B5}", - 'reversedtilde' => "\x{223D}", - 'reviahebrew' => "\x{0597}", - 'reviamugrashhebrew' => "\x{0597}", - 'rfishhook' => "\x{027E}", - 'rfishhookreversed' => "\x{027F}", - 'rhabengali' => "\x{09DD}", - 'rhadeva' => "\x{095D}", - 'rhook' => "\x{027D}", - 'rhookturned' => "\x{027B}", - 'rhookturnedsuperior' => "\x{02B5}", - 'rhosymbolgreek' => "\x{03F1}", - 'rhotichookmod' => "\x{02DE}", - 'rieulacirclekorean' => "\x{3271}", - 'rieulaparenkorean' => "\x{3211}", - 'rieulcirclekorean' => "\x{3263}", - 'rieulhieuhkorean' => "\x{3140}", - 'rieulkiyeokkorean' => "\x{313A}", - 'rieulkiyeoksioskorean' => "\x{3169}", - 'rieulkorean' => "\x{3139}", - 'rieulmieumkorean' => "\x{313B}", - 'rieulpansioskorean' => "\x{316C}", - 'rieulparenkorean' => "\x{3203}", - 'rieulphieuphkorean' => "\x{313F}", - 'rieulpieupkorean' => "\x{313C}", - 'rieulpieupsioskorean' => "\x{316B}", - 'rieulsioskorean' => "\x{313D}", - 'rieulthieuthkorean' => "\x{313E}", - 'rieultikeutkorean' => "\x{316A}", - 'rieulyeorinhieuhkorean' => "\x{316D}", - 'rightangle' => "\x{221F}", - 'righttackbelowcmb' => "\x{0319}", - 'righttriangle' => "\x{22BF}", - 'rihiragana' => "\x{308A}", - 'rikatakana' => "\x{30EA}", - 'rikatakanahalfwidth' => "\x{FF98}", - 'ringbelowcmb' => "\x{0325}", - 'ringcmb' => "\x{030A}", - 'ringhalfleft' => "\x{02BF}", - 'ringhalfleftarmenian' => "\x{0559}", - 'ringhalfleftbelowcmb' => "\x{031C}", - 'ringhalfleftcentered' => "\x{02D3}", - 'ringhalfright' => "\x{02BE}", - 'ringhalfrightbelowcmb' => "\x{0339}", - 'ringhalfrightcentered' => "\x{02D2}", - 'rinvertedbreve' => "\x{0213}", - 'rittorusquare' => "\x{3351}", - 'rlinebelow' => "\x{1E5F}", - 'rlongleg' => "\x{027C}", - 'rlonglegturned' => "\x{027A}", - 'rmonospace' => "\x{FF52}", - 'rohiragana' => "\x{308D}", - 'rokatakana' => "\x{30ED}", - 'rokatakanahalfwidth' => "\x{FF9B}", - 'roruathai' => "\x{0E23}", - 'rparen' => "\x{24AD}", - 'rrabengali' => "\x{09DC}", - 'rradeva' => "\x{0931}", - 'rragurmukhi' => "\x{0A5C}", - 'rreharabic' => "\x{0691}", - 'rrehfinalarabic' => "\x{FB8D}", - 'rrvocalicbengali' => "\x{09E0}", - 'rrvocalicdeva' => "\x{0960}", - 'rrvocalicgujarati' => "\x{0AE0}", - 'rrvocalicvowelsignbengali' => "\x{09C4}", - 'rrvocalicvowelsigndeva' => "\x{0944}", - 'rrvocalicvowelsigngujarati' => "\x{0AC4}", - 'rsuperior' => "\x{F6F1}", - 'rturned' => "\x{0279}", - 'rturnedsuperior' => "\x{02B4}", - 'ruhiragana' => "\x{308B}", - 'rukatakana' => "\x{30EB}", - 'rukatakanahalfwidth' => "\x{FF99}", - 'rupeemarkbengali' => "\x{09F2}", - 'rupeesignbengali' => "\x{09F3}", - 'rupiah' => "\x{F6DD}", - 'ruthai' => "\x{0E24}", - 'rvocalicbengali' => "\x{098B}", - 'rvocalicdeva' => "\x{090B}", - 'rvocalicgujarati' => "\x{0A8B}", - 'rvocalicvowelsignbengali' => "\x{09C3}", - 'rvocalicvowelsigndeva' => "\x{0943}", - 'rvocalicvowelsigngujarati' => "\x{0AC3}", - 'sabengali' => "\x{09B8}", - 'sacutedotaccent' => "\x{1E65}", - 'sadarabic' => "\x{0635}", - 'sadeva' => "\x{0938}", - 'sadfinalarabic' => "\x{FEBA}", - 'sadinitialarabic' => "\x{FEBB}", - 'sadmedialarabic' => "\x{FEBC}", - 'sagujarati' => "\x{0AB8}", - 'sagurmukhi' => "\x{0A38}", - 'sahiragana' => "\x{3055}", - 'sakatakana' => "\x{30B5}", - 'sakatakanahalfwidth' => "\x{FF7B}", - 'sallallahoualayhewasallamarabic' => "\x{FDFA}", - 'samekh' => "\x{05E1}", - 'samekhdagesh' => "\x{FB41}", - 'samekhdageshhebrew' => "\x{FB41}", - 'samekhhebrew' => "\x{05E1}", - 'saraaathai' => "\x{0E32}", - 'saraaethai' => "\x{0E41}", - 'saraaimaimalaithai' => "\x{0E44}", - 'saraaimaimuanthai' => "\x{0E43}", - 'saraamthai' => "\x{0E33}", - 'saraathai' => "\x{0E30}", - 'saraethai' => "\x{0E40}", - 'saraiileftthai' => "\x{F886}", - 'saraiithai' => "\x{0E35}", - 'saraileftthai' => "\x{F885}", - 'saraithai' => "\x{0E34}", - 'saraothai' => "\x{0E42}", - 'saraueeleftthai' => "\x{F888}", - 'saraueethai' => "\x{0E37}", - 'saraueleftthai' => "\x{F887}", - 'sarauethai' => "\x{0E36}", - 'sarauthai' => "\x{0E38}", - 'sarauuthai' => "\x{0E39}", - 'sbopomofo' => "\x{3119}", - 'scarondotaccent' => "\x{1E67}", - 'schwa' => "\x{0259}", - 'schwacyrillic' => "\x{04D9}", - 'schwadieresiscyrillic' => "\x{04DB}", - 'schwahook' => "\x{025A}", - 'scircle' => "\x{24E2}", - 'sdotaccent' => "\x{1E61}", - 'sdotbelow' => "\x{1E63}", - 'sdotbelowdotaccent' => "\x{1E69}", - 'seagullbelowcmb' => "\x{033C}", - 'secondtonechinese' => "\x{02CA}", - 'seenarabic' => "\x{0633}", - 'seenfinalarabic' => "\x{FEB2}", - 'seeninitialarabic' => "\x{FEB3}", - 'seenmedialarabic' => "\x{FEB4}", - 'segol' => "\x{05B6}", - 'segol13' => "\x{05B6}", - 'segol1f' => "\x{05B6}", - 'segol2c' => "\x{05B6}", - 'segolhebrew' => "\x{05B6}", - 'segolnarrowhebrew' => "\x{05B6}", - 'segolquarterhebrew' => "\x{05B6}", - 'segoltahebrew' => "\x{0592}", - 'segolwidehebrew' => "\x{05B6}", - 'seharmenian' => "\x{057D}", - 'sehiragana' => "\x{305B}", - 'sekatakana' => "\x{30BB}", - 'sekatakanahalfwidth' => "\x{FF7E}", - 'semicolonarabic' => "\x{061B}", - 'semicolonmonospace' => "\x{FF1B}", - 'semicolonsmall' => "\x{FE54}", - 'semivoicedmarkkana' => "\x{309C}", - 'semivoicedmarkkanahalfwidth' => "\x{FF9F}", - 'sentisquare' => "\x{3322}", - 'sentosquare' => "\x{3323}", - 'sevenarabic' => "\x{0667}", - 'sevenbengali' => "\x{09ED}", - 'sevencircle' => "\x{2466}", - 'sevencircleinversesansserif' => "\x{2790}", - 'sevendeva' => "\x{096D}", - 'sevengujarati' => "\x{0AED}", - 'sevengurmukhi' => "\x{0A6D}", - 'sevenhackarabic' => "\x{0667}", - 'sevenhangzhou' => "\x{3027}", - 'sevenideographicparen' => "\x{3226}", - 'seveninferior' => "\x{2087}", - 'sevenmonospace' => "\x{FF17}", - 'sevenoldstyle' => "\x{F737}", - 'sevenparen' => "\x{247A}", - 'sevenperiod' => "\x{248E}", - 'sevenpersian' => "\x{06F7}", - 'sevenroman' => "\x{2176}", - 'sevensuperior' => "\x{2077}", - 'seventeencircle' => "\x{2470}", - 'seventeenparen' => "\x{2484}", - 'seventeenperiod' => "\x{2498}", - 'seventhai' => "\x{0E57}", - 'sfthyphen' => "\x{00AD}", - 'shaarmenian' => "\x{0577}", - 'shabengali' => "\x{09B6}", - 'shacyrillic' => "\x{0448}", - 'shaddaarabic' => "\x{0651}", - 'shaddadammaarabic' => "\x{FC61}", - 'shaddadammatanarabic' => "\x{FC5E}", - 'shaddafathaarabic' => "\x{FC60}", - 'shaddafathatanarabic' => "\x{0651}\x{064B}", - 'shaddakasraarabic' => "\x{FC62}", - 'shaddakasratanarabic' => "\x{FC5F}", - 'shadedark' => "\x{2593}", - 'shadelight' => "\x{2591}", - 'shademedium' => "\x{2592}", - 'shadeva' => "\x{0936}", - 'shagujarati' => "\x{0AB6}", - 'shagurmukhi' => "\x{0A36}", - 'shalshelethebrew' => "\x{0593}", - 'shbopomofo' => "\x{3115}", - 'shchacyrillic' => "\x{0449}", - 'sheenarabic' => "\x{0634}", - 'sheenfinalarabic' => "\x{FEB6}", - 'sheeninitialarabic' => "\x{FEB7}", - 'sheenmedialarabic' => "\x{FEB8}", - 'sheicoptic' => "\x{03E3}", - 'sheqel' => "\x{20AA}", - 'sheqelhebrew' => "\x{20AA}", - 'sheva' => "\x{05B0}", - 'sheva115' => "\x{05B0}", - 'sheva15' => "\x{05B0}", - 'sheva22' => "\x{05B0}", - 'sheva2e' => "\x{05B0}", - 'shevahebrew' => "\x{05B0}", - 'shevanarrowhebrew' => "\x{05B0}", - 'shevaquarterhebrew' => "\x{05B0}", - 'shevawidehebrew' => "\x{05B0}", - 'shhacyrillic' => "\x{04BB}", - 'shimacoptic' => "\x{03ED}", - 'shin' => "\x{05E9}", - 'shindagesh' => "\x{FB49}", - 'shindageshhebrew' => "\x{FB49}", - 'shindageshshindot' => "\x{FB2C}", - 'shindageshshindothebrew' => "\x{FB2C}", - 'shindageshsindot' => "\x{FB2D}", - 'shindageshsindothebrew' => "\x{FB2D}", - 'shindothebrew' => "\x{05C1}", - 'shinhebrew' => "\x{05E9}", - 'shinshindot' => "\x{FB2A}", - 'shinshindothebrew' => "\x{FB2A}", - 'shinsindot' => "\x{FB2B}", - 'shinsindothebrew' => "\x{FB2B}", - 'shook' => "\x{0282}", - 'sigmafinal' => "\x{03C2}", - 'sigmalunatesymbolgreek' => "\x{03F2}", - 'sihiragana' => "\x{3057}", - 'sikatakana' => "\x{30B7}", - 'sikatakanahalfwidth' => "\x{FF7C}", - 'siluqhebrew' => "\x{05BD}", - 'siluqlefthebrew' => "\x{05BD}", - 'sindothebrew' => "\x{05C2}", - 'siosacirclekorean' => "\x{3274}", - 'siosaparenkorean' => "\x{3214}", - 'sioscieuckorean' => "\x{317E}", - 'sioscirclekorean' => "\x{3266}", - 'sioskiyeokkorean' => "\x{317A}", - 'sioskorean' => "\x{3145}", - 'siosnieunkorean' => "\x{317B}", - 'siosparenkorean' => "\x{3206}", - 'siospieupkorean' => "\x{317D}", - 'siostikeutkorean' => "\x{317C}", - 'sixarabic' => "\x{0666}", - 'sixbengali' => "\x{09EC}", - 'sixcircle' => "\x{2465}", - 'sixcircleinversesansserif' => "\x{278F}", - 'sixdeva' => "\x{096C}", - 'sixgujarati' => "\x{0AEC}", - 'sixgurmukhi' => "\x{0A6C}", - 'sixhackarabic' => "\x{0666}", - 'sixhangzhou' => "\x{3026}", - 'sixideographicparen' => "\x{3225}", - 'sixinferior' => "\x{2086}", - 'sixmonospace' => "\x{FF16}", - 'sixoldstyle' => "\x{F736}", - 'sixparen' => "\x{2479}", - 'sixperiod' => "\x{248D}", - 'sixpersian' => "\x{06F6}", - 'sixroman' => "\x{2175}", - 'sixsuperior' => "\x{2076}", - 'sixteencircle' => "\x{246F}", - 'sixteencurrencydenominatorbengali' => "\x{09F9}", - 'sixteenparen' => "\x{2483}", - 'sixteenperiod' => "\x{2497}", - 'sixthai' => "\x{0E56}", - 'slashmonospace' => "\x{FF0F}", - 'slong' => "\x{017F}", - 'slongdotaccent' => "\x{1E9B}", - 'smonospace' => "\x{FF53}", - 'sofpasuqhebrew' => "\x{05C3}", - 'softhyphen' => "\x{00AD}", - 'softsigncyrillic' => "\x{044C}", - 'sohiragana' => "\x{305D}", - 'sokatakana' => "\x{30BD}", - 'sokatakanahalfwidth' => "\x{FF7F}", - 'soliduslongoverlaycmb' => "\x{0338}", - 'solidusshortoverlaycmb' => "\x{0337}", - 'sorusithai' => "\x{0E29}", - 'sosalathai' => "\x{0E28}", - 'sosothai' => "\x{0E0B}", - 'sosuathai' => "\x{0E2A}", - 'spacehackarabic' => "\x{0020}", - 'spadesuitblack' => "\x{2660}", - 'spadesuitwhite' => "\x{2664}", - 'sparen' => "\x{24AE}", - 'squarebelowcmb' => "\x{033B}", - 'squarecc' => "\x{33C4}", - 'squarecm' => "\x{339D}", - 'squarediagonalcrosshatchfill' => "\x{25A9}", - 'squarehorizontalfill' => "\x{25A4}", - 'squarekg' => "\x{338F}", - 'squarekm' => "\x{339E}", - 'squarekmcapital' => "\x{33CE}", - 'squareln' => "\x{33D1}", - 'squarelog' => "\x{33D2}", - 'squaremg' => "\x{338E}", - 'squaremil' => "\x{33D5}", - 'squaremm' => "\x{339C}", - 'squaremsquared' => "\x{33A1}", - 'squareorthogonalcrosshatchfill' => "\x{25A6}", - 'squareupperlefttolowerrightfill' => "\x{25A7}", - 'squareupperrighttolowerleftfill' => "\x{25A8}", - 'squareverticalfill' => "\x{25A5}", - 'squarewhitewithsmallblack' => "\x{25A3}", - 'srsquare' => "\x{33DB}", - 'ssabengali' => "\x{09B7}", - 'ssadeva' => "\x{0937}", - 'ssagujarati' => "\x{0AB7}", - 'ssangcieuckorean' => "\x{3149}", - 'ssanghieuhkorean' => "\x{3185}", - 'ssangieungkorean' => "\x{3180}", - 'ssangkiyeokkorean' => "\x{3132}", - 'ssangnieunkorean' => "\x{3165}", - 'ssangpieupkorean' => "\x{3143}", - 'ssangsioskorean' => "\x{3146}", - 'ssangtikeutkorean' => "\x{3138}", - 'ssuperior' => "\x{F6F2}", - 'sterlingmonospace' => "\x{FFE1}", - 'strokelongoverlaycmb' => "\x{0336}", - 'strokeshortoverlaycmb' => "\x{0335}", - 'subset' => "\x{2282}", - 'subsetnotequal' => "\x{228A}", - 'subsetorequal' => "\x{2286}", - 'succeeds' => "\x{227B}", - 'suhiragana' => "\x{3059}", - 'sukatakana' => "\x{30B9}", - 'sukatakanahalfwidth' => "\x{FF7D}", - 'sukunarabic' => "\x{0652}", - 'superset' => "\x{2283}", - 'supersetnotequal' => "\x{228B}", - 'supersetorequal' => "\x{2287}", - 'svsquare' => "\x{33DC}", - 'syouwaerasquare' => "\x{337C}", - 'tabengali' => "\x{09A4}", - 'tackdown' => "\x{22A4}", - 'tackleft' => "\x{22A3}", - 'tadeva' => "\x{0924}", - 'tagujarati' => "\x{0AA4}", - 'tagurmukhi' => "\x{0A24}", - 'taharabic' => "\x{0637}", - 'tahfinalarabic' => "\x{FEC2}", - 'tahinitialarabic' => "\x{FEC3}", - 'tahiragana' => "\x{305F}", - 'tahmedialarabic' => "\x{FEC4}", - 'taisyouerasquare' => "\x{337D}", - 'takatakana' => "\x{30BF}", - 'takatakanahalfwidth' => "\x{FF80}", - 'tatweelarabic' => "\x{0640}", - 'tav' => "\x{05EA}", - 'tavdages' => "\x{FB4A}", - 'tavdagesh' => "\x{FB4A}", - 'tavdageshhebrew' => "\x{FB4A}", - 'tavhebrew' => "\x{05EA}", - 'tbopomofo' => "\x{310A}", - 'tccurl' => "\x{02A8}", - 'tcedilla' => "\x{0163}", - 'tcheharabic' => "\x{0686}", - 'tchehfinalarabic' => "\x{FB7B}", - 'tchehinitialarabic' => "\x{FB7C}", - 'tchehmedialarabic' => "\x{FB7D}", - 'tchehmeeminitialarabic' => "\x{FB7C}\x{FEE4}", - 'tcircle' => "\x{24E3}", - 'tcircumflexbelow' => "\x{1E71}", - 'tdieresis' => "\x{1E97}", - 'tdotaccent' => "\x{1E6B}", - 'tdotbelow' => "\x{1E6D}", - 'tecyrillic' => "\x{0442}", - 'tedescendercyrillic' => "\x{04AD}", - 'teharabic' => "\x{062A}", - 'tehfinalarabic' => "\x{FE96}", - 'tehhahinitialarabic' => "\x{FCA2}", - 'tehhahisolatedarabic' => "\x{FC0C}", - 'tehinitialarabic' => "\x{FE97}", - 'tehiragana' => "\x{3066}", - 'tehjeeminitialarabic' => "\x{FCA1}", - 'tehjeemisolatedarabic' => "\x{FC0B}", - 'tehmarbutaarabic' => "\x{0629}", - 'tehmarbutafinalarabic' => "\x{FE94}", - 'tehmedialarabic' => "\x{FE98}", - 'tehmeeminitialarabic' => "\x{FCA4}", - 'tehmeemisolatedarabic' => "\x{FC0E}", - 'tehnoonfinalarabic' => "\x{FC73}", - 'tekatakana' => "\x{30C6}", - 'tekatakanahalfwidth' => "\x{FF83}", - 'telephone' => "\x{2121}", - 'telephoneblack' => "\x{260E}", - 'telishagedolahebrew' => "\x{05A0}", - 'telishaqetanahebrew' => "\x{05A9}", - 'tencircle' => "\x{2469}", - 'tenideographicparen' => "\x{3229}", - 'tenparen' => "\x{247D}", - 'tenperiod' => "\x{2491}", - 'tenroman' => "\x{2179}", - 'tesh' => "\x{02A7}", - 'tet' => "\x{05D8}", - 'tetdagesh' => "\x{FB38}", - 'tetdageshhebrew' => "\x{FB38}", - 'tethebrew' => "\x{05D8}", - 'tetsecyrillic' => "\x{04B5}", - 'tevirhebrew' => "\x{059B}", - 'tevirlefthebrew' => "\x{059B}", - 'thabengali' => "\x{09A5}", - 'thadeva' => "\x{0925}", - 'thagujarati' => "\x{0AA5}", - 'thagurmukhi' => "\x{0A25}", - 'thalarabic' => "\x{0630}", - 'thalfinalarabic' => "\x{FEAC}", - 'thanthakhatlowleftthai' => "\x{F898}", - 'thanthakhatlowrightthai' => "\x{F897}", - 'thanthakhatthai' => "\x{0E4C}", - 'thanthakhatupperleftthai' => "\x{F896}", - 'theharabic' => "\x{062B}", - 'thehfinalarabic' => "\x{FE9A}", - 'thehinitialarabic' => "\x{FE9B}", - 'thehmedialarabic' => "\x{FE9C}", - 'thereexists' => "\x{2203}", - 'thetasymbolgreek' => "\x{03D1}", - 'thieuthacirclekorean' => "\x{3279}", - 'thieuthaparenkorean' => "\x{3219}", - 'thieuthcirclekorean' => "\x{326B}", - 'thieuthkorean' => "\x{314C}", - 'thieuthparenkorean' => "\x{320B}", - 'thirteencircle' => "\x{246C}", - 'thirteenparen' => "\x{2480}", - 'thirteenperiod' => "\x{2494}", - 'thonangmonthothai' => "\x{0E11}", - 'thook' => "\x{01AD}", - 'thophuthaothai' => "\x{0E12}", - 'thothahanthai' => "\x{0E17}", - 'thothanthai' => "\x{0E10}", - 'thothongthai' => "\x{0E18}", - 'thothungthai' => "\x{0E16}", - 'thousandcyrillic' => "\x{0482}", - 'thousandsseparatorarabic' => "\x{066C}", - 'thousandsseparatorpersian' => "\x{066C}", - 'threearabic' => "\x{0663}", - 'threebengali' => "\x{09E9}", - 'threecircle' => "\x{2462}", - 'threecircleinversesansserif' => "\x{278C}", - 'threedeva' => "\x{0969}", - 'threegujarati' => "\x{0AE9}", - 'threegurmukhi' => "\x{0A69}", - 'threehackarabic' => "\x{0663}", - 'threehangzhou' => "\x{3023}", - 'threeideographicparen' => "\x{3222}", - 'threeinferior' => "\x{2083}", - 'threemonospace' => "\x{FF13}", - 'threenumeratorbengali' => "\x{09F6}", - 'threeoldstyle' => "\x{F733}", - 'threeparen' => "\x{2476}", - 'threeperiod' => "\x{248A}", - 'threepersian' => "\x{06F3}", - 'threequartersemdash' => "\x{F6DE}", - 'threeroman' => "\x{2172}", - 'threethai' => "\x{0E53}", - 'thzsquare' => "\x{3394}", - 'tihiragana' => "\x{3061}", - 'tikatakana' => "\x{30C1}", - 'tikatakanahalfwidth' => "\x{FF81}", - 'tikeutacirclekorean' => "\x{3270}", - 'tikeutaparenkorean' => "\x{3210}", - 'tikeutcirclekorean' => "\x{3262}", - 'tikeutkorean' => "\x{3137}", - 'tikeutparenkorean' => "\x{3202}", - 'tildebelowcmb' => "\x{0330}", - 'tildecmb' => "\x{0303}", - 'tildedoublecmb' => "\x{0360}", - 'tildeoperator' => "\x{223C}", - 'tildeoverlaycmb' => "\x{0334}", - 'tildeverticalcmb' => "\x{033E}", - 'timescircle' => "\x{2297}", - 'tipehahebrew' => "\x{0596}", - 'tipehalefthebrew' => "\x{0596}", - 'tippigurmukhi' => "\x{0A70}", - 'titlocyrilliccmb' => "\x{0483}", - 'tiwnarmenian' => "\x{057F}", - 'tlinebelow' => "\x{1E6F}", - 'tmonospace' => "\x{FF54}", - 'toarmenian' => "\x{0569}", - 'tohiragana' => "\x{3068}", - 'tokatakana' => "\x{30C8}", - 'tokatakanahalfwidth' => "\x{FF84}", - 'tonebarextrahighmod' => "\x{02E5}", - 'tonebarextralowmod' => "\x{02E9}", - 'tonebarhighmod' => "\x{02E6}", - 'tonebarlowmod' => "\x{02E8}", - 'tonebarmidmod' => "\x{02E7}", - 'tonefive' => "\x{01BD}", - 'tonesix' => "\x{0185}", - 'tonetwo' => "\x{01A8}", - 'tonsquare' => "\x{3327}", - 'topatakthai' => "\x{0E0F}", - 'tortoiseshellbracketleft' => "\x{3014}", - 'tortoiseshellbracketleftsmall' => "\x{FE5D}", - 'tortoiseshellbracketleftvertical' => "\x{FE39}", - 'tortoiseshellbracketright' => "\x{3015}", - 'tortoiseshellbracketrightsmall' => "\x{FE5E}", - 'tortoiseshellbracketrightvertical' => "\x{FE3A}", - 'totaothai' => "\x{0E15}", - 'tpalatalhook' => "\x{01AB}", - 'tparen' => "\x{24AF}", - 'trademarksans' => "\x{F8EA}", - 'trademarkserif' => "\x{F6DB}", - 'tretroflexhook' => "\x{0288}", - 'ts' => "\x{02A6}", - 'tsadi' => "\x{05E6}", - 'tsadidagesh' => "\x{FB46}", - 'tsadidageshhebrew' => "\x{FB46}", - 'tsadihebrew' => "\x{05E6}", - 'tsecyrillic' => "\x{0446}", - 'tsere' => "\x{05B5}", - 'tsere12' => "\x{05B5}", - 'tsere1e' => "\x{05B5}", - 'tsere2b' => "\x{05B5}", - 'tserehebrew' => "\x{05B5}", - 'tserenarrowhebrew' => "\x{05B5}", - 'tserequarterhebrew' => "\x{05B5}", - 'tserewidehebrew' => "\x{05B5}", - 'tshecyrillic' => "\x{045B}", - 'tsuperior' => "\x{F6F3}", - 'ttabengali' => "\x{099F}", - 'ttadeva' => "\x{091F}", - 'ttagujarati' => "\x{0A9F}", - 'ttagurmukhi' => "\x{0A1F}", - 'tteharabic' => "\x{0679}", - 'ttehfinalarabic' => "\x{FB67}", - 'ttehinitialarabic' => "\x{FB68}", - 'ttehmedialarabic' => "\x{FB69}", - 'tthabengali' => "\x{09A0}", - 'tthadeva' => "\x{0920}", - 'tthagujarati' => "\x{0AA0}", - 'tthagurmukhi' => "\x{0A20}", - 'tturned' => "\x{0287}", - 'tuhiragana' => "\x{3064}", - 'tukatakana' => "\x{30C4}", - 'tukatakanahalfwidth' => "\x{FF82}", - 'tusmallhiragana' => "\x{3063}", - 'tusmallkatakana' => "\x{30C3}", - 'tusmallkatakanahalfwidth' => "\x{FF6F}", - 'twelvecircle' => "\x{246B}", - 'twelveparen' => "\x{247F}", - 'twelveperiod' => "\x{2493}", - 'twelveroman' => "\x{217B}", - 'twentycircle' => "\x{2473}", - 'twentyhangzhou' => "\x{5344}", - 'twentyparen' => "\x{2487}", - 'twentyperiod' => "\x{249B}", - 'twoarabic' => "\x{0662}", - 'twobengali' => "\x{09E8}", - 'twocircle' => "\x{2461}", - 'twocircleinversesansserif' => "\x{278B}", - 'twodeva' => "\x{0968}", - 'twodotleader' => "\x{2025}", - 'twodotleadervertical' => "\x{FE30}", - 'twogujarati' => "\x{0AE8}", - 'twogurmukhi' => "\x{0A68}", - 'twohackarabic' => "\x{0662}", - 'twohangzhou' => "\x{3022}", - 'twoideographicparen' => "\x{3221}", - 'twoinferior' => "\x{2082}", - 'twomonospace' => "\x{FF12}", - 'twonumeratorbengali' => "\x{09F5}", - 'twooldstyle' => "\x{F732}", - 'twoparen' => "\x{2475}", - 'twoperiod' => "\x{2489}", - 'twopersian' => "\x{06F2}", - 'tworoman' => "\x{2171}", - 'twostroke' => "\x{01BB}", - 'twothai' => "\x{0E52}", - 'ubar' => "\x{0289}", - 'ubengali' => "\x{0989}", - 'ubopomofo' => "\x{3128}", - 'ucaron' => "\x{01D4}", - 'ucircle' => "\x{24E4}", - 'ucircumflexbelow' => "\x{1E77}", - 'ucyrillic' => "\x{0443}", - 'udattadeva' => "\x{0951}", - 'udblacute' => "\x{0171}", - 'udblgrave' => "\x{0215}", - 'udeva' => "\x{0909}", - 'udieresisacute' => "\x{01D8}", - 'udieresisbelow' => "\x{1E73}", - 'udieresiscaron' => "\x{01DA}", - 'udieresiscyrillic' => "\x{04F1}", - 'udieresisgrave' => "\x{01DC}", - 'udieresismacron' => "\x{01D6}", - 'udotbelow' => "\x{1EE5}", - 'ugujarati' => "\x{0A89}", - 'ugurmukhi' => "\x{0A09}", - 'uhiragana' => "\x{3046}", - 'uhookabove' => "\x{1EE7}", - 'uhornacute' => "\x{1EE9}", - 'uhorndotbelow' => "\x{1EF1}", - 'uhorngrave' => "\x{1EEB}", - 'uhornhookabove' => "\x{1EED}", - 'uhorntilde' => "\x{1EEF}", - 'uhungarumlautcyrillic' => "\x{04F3}", - 'uinvertedbreve' => "\x{0217}", - 'ukatakana' => "\x{30A6}", - 'ukatakanahalfwidth' => "\x{FF73}", - 'ukcyrillic' => "\x{0479}", - 'ukorean' => "\x{315C}", - 'umacroncyrillic' => "\x{04EF}", - 'umacrondieresis' => "\x{1E7B}", - 'umatragurmukhi' => "\x{0A41}", - 'umonospace' => "\x{FF55}", - 'underscoremonospace' => "\x{FF3F}", - 'underscorevertical' => "\x{FE33}", - 'underscorewavy' => "\x{FE4F}", - 'uparen' => "\x{24B0}", - 'upperdothebrew' => "\x{05C4}", - 'upsilonlatin' => "\x{028A}", - 'uptackbelowcmb' => "\x{031D}", - 'uptackmod' => "\x{02D4}", - 'uragurmukhi' => "\x{0A73}", - 'ushortcyrillic' => "\x{045E}", - 'usmallhiragana' => "\x{3045}", - 'usmallkatakana' => "\x{30A5}", - 'usmallkatakanahalfwidth' => "\x{FF69}", - 'ustraightcyrillic' => "\x{04AF}", - 'ustraightstrokecyrillic' => "\x{04B1}", - 'utildeacute' => "\x{1E79}", - 'utildebelow' => "\x{1E75}", - 'uubengali' => "\x{098A}", - 'uudeva' => "\x{090A}", - 'uugujarati' => "\x{0A8A}", - 'uugurmukhi' => "\x{0A0A}", - 'uumatragurmukhi' => "\x{0A42}", - 'uuvowelsignbengali' => "\x{09C2}", - 'uuvowelsigndeva' => "\x{0942}", - 'uuvowelsigngujarati' => "\x{0AC2}", - 'uvowelsignbengali' => "\x{09C1}", - 'uvowelsigndeva' => "\x{0941}", - 'uvowelsigngujarati' => "\x{0AC1}", - 'vadeva' => "\x{0935}", - 'vagujarati' => "\x{0AB5}", - 'vagurmukhi' => "\x{0A35}", - 'vakatakana' => "\x{30F7}", - 'vav' => "\x{05D5}", - 'vavdagesh' => "\x{FB35}", - 'vavdagesh65' => "\x{FB35}", - 'vavdageshhebrew' => "\x{FB35}", - 'vavhebrew' => "\x{05D5}", - 'vavholam' => "\x{FB4B}", - 'vavholamhebrew' => "\x{FB4B}", - 'vavvavhebrew' => "\x{05F0}", - 'vavyodhebrew' => "\x{05F1}", - 'vcircle' => "\x{24E5}", - 'vdotbelow' => "\x{1E7F}", - 'vecyrillic' => "\x{0432}", - 'veharabic' => "\x{06A4}", - 'vehfinalarabic' => "\x{FB6B}", - 'vehinitialarabic' => "\x{FB6C}", - 'vehmedialarabic' => "\x{FB6D}", - 'vekatakana' => "\x{30F9}", - 'venus' => "\x{2640}", - 'verticalbar' => "\x{007C}", - 'verticallineabovecmb' => "\x{030D}", - 'verticallinebelowcmb' => "\x{0329}", - 'verticallinelowmod' => "\x{02CC}", - 'verticallinemod' => "\x{02C8}", - 'vewarmenian' => "\x{057E}", - 'vhook' => "\x{028B}", - 'vikatakana' => "\x{30F8}", - 'viramabengali' => "\x{09CD}", - 'viramadeva' => "\x{094D}", - 'viramagujarati' => "\x{0ACD}", - 'visargabengali' => "\x{0983}", - 'visargadeva' => "\x{0903}", - 'visargagujarati' => "\x{0A83}", - 'vmonospace' => "\x{FF56}", - 'voarmenian' => "\x{0578}", - 'voicediterationhiragana' => "\x{309E}", - 'voicediterationkatakana' => "\x{30FE}", - 'voicedmarkkana' => "\x{309B}", - 'voicedmarkkanahalfwidth' => "\x{FF9E}", - 'vokatakana' => "\x{30FA}", - 'vparen' => "\x{24B1}", - 'vtilde' => "\x{1E7D}", - 'vturned' => "\x{028C}", - 'vuhiragana' => "\x{3094}", - 'vukatakana' => "\x{30F4}", - 'waekorean' => "\x{3159}", - 'wahiragana' => "\x{308F}", - 'wakatakana' => "\x{30EF}", - 'wakatakanahalfwidth' => "\x{FF9C}", - 'wakorean' => "\x{3158}", - 'wasmallhiragana' => "\x{308E}", - 'wasmallkatakana' => "\x{30EE}", - 'wattosquare' => "\x{3357}", - 'wavedash' => "\x{301C}", - 'wavyunderscorevertical' => "\x{FE34}", - 'wawarabic' => "\x{0648}", - 'wawfinalarabic' => "\x{FEEE}", - 'wawhamzaabovearabic' => "\x{0624}", - 'wawhamzaabovefinalarabic' => "\x{FE86}", - 'wbsquare' => "\x{33DD}", - 'wcircle' => "\x{24E6}", - 'wdotaccent' => "\x{1E87}", - 'wdotbelow' => "\x{1E89}", - 'wehiragana' => "\x{3091}", - 'wekatakana' => "\x{30F1}", - 'wekorean' => "\x{315E}", - 'weokorean' => "\x{315D}", - 'whitebullet' => "\x{25E6}", - 'whitecircle' => "\x{25CB}", - 'whitecircleinverse' => "\x{25D9}", - 'whitecornerbracketleft' => "\x{300E}", - 'whitecornerbracketleftvertical' => "\x{FE43}", - 'whitecornerbracketright' => "\x{300F}", - 'whitecornerbracketrightvertical' => "\x{FE44}", - 'whitediamond' => "\x{25C7}", - 'whitediamondcontainingblacksmalldiamond' => "\x{25C8}", - 'whitedownpointingsmalltriangle' => "\x{25BF}", - 'whitedownpointingtriangle' => "\x{25BD}", - 'whiteleftpointingsmalltriangle' => "\x{25C3}", - 'whiteleftpointingtriangle' => "\x{25C1}", - 'whitelenticularbracketleft' => "\x{3016}", - 'whitelenticularbracketright' => "\x{3017}", - 'whiterightpointingsmalltriangle' => "\x{25B9}", - 'whiterightpointingtriangle' => "\x{25B7}", - 'whitesmallsquare' => "\x{25AB}", - 'whitesmilingface' => "\x{263A}", - 'whitesquare' => "\x{25A1}", - 'whitestar' => "\x{2606}", - 'whitetelephone' => "\x{260F}", - 'whitetortoiseshellbracketleft' => "\x{3018}", - 'whitetortoiseshellbracketright' => "\x{3019}", - 'whiteuppointingsmalltriangle' => "\x{25B5}", - 'whiteuppointingtriangle' => "\x{25B3}", - 'wihiragana' => "\x{3090}", - 'wikatakana' => "\x{30F0}", - 'wikorean' => "\x{315F}", - 'wmonospace' => "\x{FF57}", - 'wohiragana' => "\x{3092}", - 'wokatakana' => "\x{30F2}", - 'wokatakanahalfwidth' => "\x{FF66}", - 'won' => "\x{20A9}", - 'wonmonospace' => "\x{FFE6}", - 'wowaenthai' => "\x{0E27}", - 'wparen' => "\x{24B2}", - 'wring' => "\x{1E98}", - 'wsuperior' => "\x{02B7}", - 'wturned' => "\x{028D}", - 'wynn' => "\x{01BF}", - 'xabovecmb' => "\x{033D}", - 'xbopomofo' => "\x{3112}", - 'xcircle' => "\x{24E7}", - 'xdieresis' => "\x{1E8D}", - 'xdotaccent' => "\x{1E8B}", - 'xeharmenian' => "\x{056D}", - 'xmonospace' => "\x{FF58}", - 'xparen' => "\x{24B3}", - 'xsuperior' => "\x{02E3}", - 'yaadosquare' => "\x{334E}", - 'yabengali' => "\x{09AF}", - 'yadeva' => "\x{092F}", - 'yaekorean' => "\x{3152}", - 'yagujarati' => "\x{0AAF}", - 'yagurmukhi' => "\x{0A2F}", - 'yahiragana' => "\x{3084}", - 'yakatakana' => "\x{30E4}", - 'yakatakanahalfwidth' => "\x{FF94}", - 'yakorean' => "\x{3151}", - 'yamakkanthai' => "\x{0E4E}", - 'yasmallhiragana' => "\x{3083}", - 'yasmallkatakana' => "\x{30E3}", - 'yasmallkatakanahalfwidth' => "\x{FF6C}", - 'yatcyrillic' => "\x{0463}", - 'ycircle' => "\x{24E8}", - 'ydotaccent' => "\x{1E8F}", - 'ydotbelow' => "\x{1EF5}", - 'yeharabic' => "\x{064A}", - 'yehbarreearabic' => "\x{06D2}", - 'yehbarreefinalarabic' => "\x{FBAF}", - 'yehfinalarabic' => "\x{FEF2}", - 'yehhamzaabovearabic' => "\x{0626}", - 'yehhamzaabovefinalarabic' => "\x{FE8A}", - 'yehhamzaaboveinitialarabic' => "\x{FE8B}", - 'yehhamzaabovemedialarabic' => "\x{FE8C}", - 'yehinitialarabic' => "\x{FEF3}", - 'yehmedialarabic' => "\x{FEF4}", - 'yehmeeminitialarabic' => "\x{FCDD}", - 'yehmeemisolatedarabic' => "\x{FC58}", - 'yehnoonfinalarabic' => "\x{FC94}", - 'yehthreedotsbelowarabic' => "\x{06D1}", - 'yekorean' => "\x{3156}", - 'yenmonospace' => "\x{FFE5}", - 'yeokorean' => "\x{3155}", - 'yeorinhieuhkorean' => "\x{3186}", - 'yerahbenyomohebrew' => "\x{05AA}", - 'yerahbenyomolefthebrew' => "\x{05AA}", - 'yericyrillic' => "\x{044B}", - 'yerudieresiscyrillic' => "\x{04F9}", - 'yesieungkorean' => "\x{3181}", - 'yesieungpansioskorean' => "\x{3183}", - 'yesieungsioskorean' => "\x{3182}", - 'yetivhebrew' => "\x{059A}", - 'yhook' => "\x{01B4}", - 'yhookabove' => "\x{1EF7}", - 'yiarmenian' => "\x{0575}", - 'yicyrillic' => "\x{0457}", - 'yikorean' => "\x{3162}", - 'yinyang' => "\x{262F}", - 'yiwnarmenian' => "\x{0582}", - 'ymonospace' => "\x{FF59}", - 'yod' => "\x{05D9}", - 'yoddagesh' => "\x{FB39}", - 'yoddageshhebrew' => "\x{FB39}", - 'yodhebrew' => "\x{05D9}", - 'yodyodhebrew' => "\x{05F2}", - 'yodyodpatahhebrew' => "\x{FB1F}", - 'yohiragana' => "\x{3088}", - 'yoikorean' => "\x{3189}", - 'yokatakana' => "\x{30E8}", - 'yokatakanahalfwidth' => "\x{FF96}", - 'yokorean' => "\x{315B}", - 'yosmallhiragana' => "\x{3087}", - 'yosmallkatakana' => "\x{30E7}", - 'yosmallkatakanahalfwidth' => "\x{FF6E}", - 'yotgreek' => "\x{03F3}", - 'yoyaekorean' => "\x{3188}", - 'yoyakorean' => "\x{3187}", - 'yoyakthai' => "\x{0E22}", - 'yoyingthai' => "\x{0E0D}", - 'yparen' => "\x{24B4}", - 'ypogegrammeni' => "\x{037A}", - 'ypogegrammenigreekcmb' => "\x{0345}", - 'yr' => "\x{01A6}", - 'yring' => "\x{1E99}", - 'ysuperior' => "\x{02B8}", - 'ytilde' => "\x{1EF9}", - 'yturned' => "\x{028E}", - 'yuhiragana' => "\x{3086}", - 'yuikorean' => "\x{318C}", - 'yukatakana' => "\x{30E6}", - 'yukatakanahalfwidth' => "\x{FF95}", - 'yukorean' => "\x{3160}", - 'yusbigcyrillic' => "\x{046B}", - 'yusbigiotifiedcyrillic' => "\x{046D}", - 'yuslittlecyrillic' => "\x{0467}", - 'yuslittleiotifiedcyrillic' => "\x{0469}", - 'yusmallhiragana' => "\x{3085}", - 'yusmallkatakana' => "\x{30E5}", - 'yusmallkatakanahalfwidth' => "\x{FF6D}", - 'yuyekorean' => "\x{318B}", - 'yuyeokorean' => "\x{318A}", - 'yyabengali' => "\x{09DF}", - 'yyadeva' => "\x{095F}", - 'zaarmenian' => "\x{0566}", - 'zadeva' => "\x{095B}", - 'zagurmukhi' => "\x{0A5B}", - 'zaharabic' => "\x{0638}", - 'zahfinalarabic' => "\x{FEC6}", - 'zahinitialarabic' => "\x{FEC7}", - 'zahiragana' => "\x{3056}", - 'zahmedialarabic' => "\x{FEC8}", - 'zainarabic' => "\x{0632}", - 'zainfinalarabic' => "\x{FEB0}", - 'zakatakana' => "\x{30B6}", - 'zaqefgadolhebrew' => "\x{0595}", - 'zaqefqatanhebrew' => "\x{0594}", - 'zarqahebrew' => "\x{0598}", - 'zayin' => "\x{05D6}", - 'zayindagesh' => "\x{FB36}", - 'zayindageshhebrew' => "\x{FB36}", - 'zayinhebrew' => "\x{05D6}", - 'zbopomofo' => "\x{3117}", - 'zcircle' => "\x{24E9}", - 'zcircumflex' => "\x{1E91}", - 'zcurl' => "\x{0291}", - 'zdot' => "\x{017C}", - 'zdotbelow' => "\x{1E93}", - 'zecyrillic' => "\x{0437}", - 'zedescendercyrillic' => "\x{0499}", - 'zedieresiscyrillic' => "\x{04DF}", - 'zehiragana' => "\x{305C}", - 'zekatakana' => "\x{30BC}", - 'zeroarabic' => "\x{0660}", - 'zerobengali' => "\x{09E6}", - 'zerodeva' => "\x{0966}", - 'zerogujarati' => "\x{0AE6}", - 'zerogurmukhi' => "\x{0A66}", - 'zerohackarabic' => "\x{0660}", - 'zeroinferior' => "\x{2080}", - 'zeromonospace' => "\x{FF10}", - 'zerooldstyle' => "\x{F730}", - 'zeropersian' => "\x{06F0}", - 'zerosuperior' => "\x{2070}", - 'zerothai' => "\x{0E50}", - 'zerowidthjoiner' => "\x{FEFF}", - 'zerowidthnonjoiner' => "\x{200C}", - 'zerowidthspace' => "\x{200B}", - 'zhbopomofo' => "\x{3113}", - 'zhearmenian' => "\x{056A}", - 'zhebrevecyrillic' => "\x{04C2}", - 'zhecyrillic' => "\x{0436}", - 'zhedescendercyrillic' => "\x{0497}", - 'zhedieresiscyrillic' => "\x{04DD}", - 'zihiragana' => "\x{3058}", - 'zikatakana' => "\x{30B8}", - 'zinorhebrew' => "\x{05AE}", - 'zlinebelow' => "\x{1E95}", - 'zmonospace' => "\x{FF5A}", - 'zohiragana' => "\x{305E}", - 'zokatakana' => "\x{30BE}", - 'zparen' => "\x{24B5}", - 'zretroflexhook' => "\x{0290}", - 'zstroke' => "\x{01B6}", - 'zuhiragana' => "\x{305A}", - 'zukatakana' => "\x{30BA}", - ); - -# Add to this list the glyphs for new fonts (from aglfn13): - -map { $agl{$names{$_}} = pack('U',hex ($_))} (keys %names); - - -# %doubles = (map{$_ => "uni$_"} qw(0394 03A9 0162 2215 00AD 02C9 03BC 2219 00A0 0163)); - -=head2 lookup ( $usv [, $noAlt [, $noUni] ]) - -return the Adobe-recommended glyph name for a specific Unicode codepoint (integer). By default -returns C names rather than C or C names - -If C<$noAlt> is true, C and C names are returned rather than C. - -if C<$noUni> is true, returns undef if it would have to resort to C or C -style names. Essentially this represents a straight lookup in the Adobe-recommended list. - -=cut - -sub lookup -{ - my ($num, $noalt, $noUni) = @_; - my ($val) = sprintf("%04X", $num); - - if (defined $names{$val}) - { - return $names{$val} if ($noalt || $names{$val} !~ m/^(?:afii|SF)/o); - } - return undef if $noUni; - if ($num > 0xFFFF) - { return "u$val"; } - elsif ($num) - { return "uni$val"; } - else - { return ".notdef"; } -} - -=head2 parse ( $glyphname ) - -Parse an Adobe-conformant glyph name, generating a Unicode codepoint sequence equivalent to the glyph (or -glyph components, should the name represent a ligature). In scalar context, returns a reference to an -array of Unicodes (decimal). Array is empty if the glyph name is non-conformant. -In list context, the first item returned is the same array reference as above. The second item -is a reference to an array containing the extensions (if any) present on the glyph name. -The '.' that precedes each extension is not included. - -=cut - -sub parse -{ - my ($gname, @USVs, @extensions); - ($gname, @extensions) = split('\.', $_[0]); - # if name originally started with . (e.g., .null) then $gname will now be '' ... need to fix that up: - $gname = '.' . shift(@extensions) if $gname eq ''; - if (defined $gname) - { - foreach $gname (split('_', $gname)) - { - if ($gname =~ /^u[0-9a-fA-F]{4,6}$/) - { - push @USVs, hex(substr($gname, 1)); - } - elsif ($gname =~ /^uni([0-9a-fA-F]{4,4})+$/) - { - push @USVs, map {hex($_)} ($gname =~ /([0-9a-fA-F]{4,4})/g) - } - elsif (exists $agl{$gname}) - { - push @USVs, unpack ('U*', $agl{$gname}); - } - } - } - return \@USVs unless wantarray; - my @res = (\@USVs, \@extensions); - return @res; -} - -#Code used to parse Adobe's agl file and generate text for %agl initialization: -#while () { -# chomp; -# next if m/^#/; -# my ($gname, @nums) = split(/[; ]/); -# if ($#nums > 0 or !defined ($Font::TTF::PSNames::names{$nums[0]}) or $Font::TTF::PSNames::names{$nums[0]} ne $gname) -# { -# print "\t'$gname' => \""; -# map {print "\\x{$_}" } @nums; -# print "\",\n"; -# } -# } - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Post.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Post.pm deleted file mode 100644 index 4bf284e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Post.pm +++ /dev/null @@ -1,306 +0,0 @@ -package Font::TTF::Post; - -=head1 NAME - -Font::TTF::Post - Holds the Postscript names for each glyph - -=head1 DESCRIPTION - -Holds the postscript names for glyphs. Note that they are not held as an -array, but as indexes into two lists. The first list is the standard Postscript -name list defined by the TrueType standard. The second comes from the font -directly. - -Looking up a glyph from a Postscript name or a name from a glyph number is -achieved through methods rather than variable lookup. - -This class handles PostScript table types of 1, 2, 2.5 & 3, but not version 4. -Support for version 2.5 is as per Apple spec rather than MS. - -The way to look up Postscript names or glyphs is: - - $pname = $f->{'post'}{'VAL'}[$gnum]; - $gnum = $f->{'post'}{'STRINGS'}{$pname}; - -=head1 INSTANCE VARIABLES - -Due to different systems having different limitations, there are various class -variables available to control what post table types can be written. - -=over 4 - -=item $Font::TTF::Post::no25 - -If set tells Font::TTF::Post::out to use table type 2 instead of 2.5 in case apps -can't handle version 2.5. - -=item VAL - -Contains an array indexed by glyph number of Postscript names. This is used when -writing out a font. - -=item STRINGS - -An associative array of Postscript names mapping to the highest glyph with that -name. These may not be in sync with VAL. - -=back - -In addition there are the standard introductory variables defined in the -standard: - - FormatType - italicAngle - underlinePosition - underlineThickness - isFixedPitch - minMemType42 - maxMemType42 - minMemType1 - maxMemType1 - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA @base_set %base_set %fields $VERSION $no25 @field_info @base_set); -require Font::TTF::Table; -use Font::TTF::Utils; - -$no25 = 1; # officially deprecated format 2.5 tables in MS spec 1.3 - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'FormatType' => 'f', - 'italicAngle' => 'f', - 'underlinePosition' => 's', - 'underlineThickness' => 's', - 'isFixedPitch' => 'L', - 'minMemType42' => 'L', - 'maxMemType42' => 'L', - 'minMemType1' => 'L', - 'maxMemType1' => 'L'); -@base_set = qw(.notdef .null nonmarkingreturn space exclam quotedbl numbersign dollar percent ampersand quotesingle - parenleft parenright asterisk plus comma hyphen period slash zero one two three four five six - seven eight nine colon semicolon less equal greater question at A B C D E F G H I J K L M N O P Q - R S T U V W X Y Z bracketleft backslash bracketright asciicircum underscore grave a b c d e f g h - i j k l m n o p q r s t u v w x y z braceleft bar braceright asciitilde Adieresis Aring Ccedilla - Eacute Ntilde Odieresis Udieresis aacute agrave acircumflex adieresis atilde aring ccedilla eacute - egrave ecircumflex edieresis iacute igrave icircumflex idieresis ntilde oacute ograve ocircumflex - odieresis otilde uacute ugrave ucircumflex udieresis dagger degree cent sterling section bullet - paragraph germandbls registered copyright trademark acute dieresis notequal AE Oslash infinity - plusminus lessequal greaterequal yen mu partialdiff summation product pi integral ordfeminine - ordmasculine Omega ae oslash questiondown exclamdown logicalnot radical florin approxequal - Delta guillemotleft guillemotright ellipsis nonbreakingspace Agrave Atilde Otilde OE oe endash emdash - quotedblleft quotedblright quoteleft quoteright divide lozenge ydieresis Ydieresis fraction currency - guilsinglleft guilsinglright fi fl daggerdbl periodcentered quotesinglbase quotedblbase perthousand - Acircumflex Ecircumflex Aacute Edieresis Egrave Iacute Icircumflex Idieresis Igrave Oacute Ocircumflex - apple Ograve Uacute Ucircumflex Ugrave dotlessi circumflex tilde macron breve dotaccent - ring cedilla hungarumlaut ogonek caron Lslash lslash Scaron scaron Zcaron zcaron brokenbar Eth eth - Yacute yacute Thorn thorn minus multiply onesuperior twosuperior threesuperior onehalf onequarter - threequarters franc Gbreve gbreve Idotaccent Scedilla scedilla Cacute cacute Ccaron ccaron dcroat); - -$VERSION = 0.01; # MJPH 5-AUG-1998 Re-organise data structures - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } - $i = 0; - %base_set = map {$_ => $i++} @base_set; -} - - -=head2 $t->read - -Reads the Postscript table into memory from disk - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $dat1, $i, $off, $c, $maxoff, $form, $angle, $numGlyphs); - my ($fh) = $self->{' INFILE'}; - - $numGlyphs = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - $self->SUPER::read or return $self; - init unless ($fields{'FormatType'}); - $fh->read($dat, 32); - TTF_Read_Fields($self, $dat, \%fields); - - if (int($self->{'FormatType'} + .5) == 1) - { - for ($i = 0; $i < 258; $i++) - { - $self->{'VAL'}[$i] = $base_set[$i]; - $self->{'STRINGS'}{$base_set[$i]} = $i unless (defined $self->{'STRINGS'}{$base_set[$i]}); - } - } elsif (int($self->{'FormatType'} * 2 + .1) == 5) - { - $fh->read($dat, 2); - $numGlyphs = unpack("n", $dat); - $fh->read($dat, $numGlyphs); - for ($i = 0; $i < $numGlyphs; $i++) - { - $off = unpack("c", substr($dat, $i, 1)); - $self->{'VAL'}[$i] = $base_set[$i + $off]; - $self->{'STRINGS'}{$base_set[$i + $off]} = $i unless (defined $self->{'STRINGS'}{$base_set[$i + $off]}); - } - } elsif (int($self->{'FormatType'} + .5) == 2) - { - my (@strings); - - $fh->read($dat, ($numGlyphs + 1) << 1); - for ($i = 0; $i < $numGlyphs; $i++) - { - $off = unpack("n", substr($dat, ($i + 1) << 1, 2)); - $maxoff = $off if (!defined $maxoff || $off > $maxoff); - } - for ($i = 0; $i < $maxoff - 257; $i++) - { - $fh->read($dat1, 1); - $off = unpack("C", $dat1); - $fh->read($dat1, $off); - $strings[$i] = $dat1; - } - for ($i = 0; $i < $numGlyphs; $i++) - { - $off = unpack("n", substr($dat, ($i + 1) << 1, 2)); - if ($off > 257) - { - $self->{'VAL'}[$i] = $strings[$off - 258]; - $self->{'STRINGS'}{$strings[$off - 258]} = $i; - } - else - { - $self->{'VAL'}[$i] = $base_set[$off]; - $self->{'STRINGS'}{$base_set[$off]} = $i unless (defined $self->{'STRINGS'}{$base_set[$off]}); - } - } - } - $self; -} - - -=head2 $t->out($fh) - -Writes out a new Postscript name table from memory or copies from disk - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($i, $num); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $num = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - init unless ($fields{'FormatType'}); - - for ($i = $#{$self->{'VAL'}}; !defined $self->{'VAL'}[$i] && $i > 0; $i--) - { pop(@{$self->{'VAL'}}); } - if ($#{$self->{'VAL'}} < 0) - { $self->{'FormatType'} = 3; } - else - { - $self->{'FormatType'} = 1; - for ($i = 0; $i < $num; $i++) - { - if (!defined $base_set{$self->{'VAL'}[$i]}) - { - $self->{'FormatType'} = 2; - last; - } - elsif ($base_set{$self->{'VAL'}[$i]} != $i) - { $self->{'FormatType'} = ($no25 ? 2 : 2.5); } - } - } - - $fh->print(TTF_Out_Fields($self, \%fields, 32)); - - return $self if (int($self->{'FormatType'} + .4) == 3); - - if (int($self->{'FormatType'} + .5) == 2) - { - my (@ind); - my ($count) = 0; - - $fh->print(pack("n", $num)); - for ($i = 0; $i < $num; $i++) - { - if (defined $base_set{$self->{'VAL'}[$i]}) - { $fh->print(pack("n", $base_set{$self->{'VAL'}[$i]})); } - else - { - $fh->print(pack("n", $count + 258)); - $ind[$count++] = $i; - } - } - for ($i = 0; $i < $count; $i++) - { - $fh->print(pack("C", length($self->{'VAL'}[$ind[$i]]))); - $fh->print($self->{'VAL'}[$ind[$i]]); - } - } elsif (int($self->{'FormatType'} * 2 + .5) == 5) - { - $fh->print(pack("n", $num)); - for ($i = 0; $i < $num; $i++) - { $fh->print(pack("c", defined $base_set{$self->{'VAL'}[$i]} ? - $base_set{$self->{'VAL'}[$i]} - $i : -$i)); } - } - - $self; -} - - -=head2 $t->XML_element($context, $depth, $key, $val) - -Outputs the names as one block of XML - -=cut - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $val) = @_; - my ($fh) = $context->{'fh'}; - my ($i); - - return $self->SUPER::XML_element(@_) unless ($key eq 'STRINGS' || $key eq 'VAL'); - return unless ($key eq 'VAL'); - - $fh->print("$depth\n"); - for ($i = 0; $i <= $#{$self->{'VAL'}}; $i++) - { $fh->print("$depth$context->{'indent'}\n"); } - $fh->print("$depth\n"); - $self; -} - -1; - -=head1 BUGS - -=over 4 - -=item * - -No support for type 4 tables - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prep.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prep.pm deleted file mode 100644 index 453cf5a..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prep.pm +++ /dev/null @@ -1,89 +0,0 @@ -package Font::TTF::Prep; - -=head1 NAME - -Font::TTF::Prep - Preparation hinting program. Called when ppem changes - -=head1 DESCRIPTION - -This is a minimal class adding nothing beyond a table, but is a repository -for prep type information for those processes brave enough to address hinting. - -=cut - -use strict; -use vars qw(@ISA $VERSION); -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); - -$VERSION = 0.0001; - - -=head2 $t->read - -Reads the data using C. - -=cut - -sub read -{ - $_[0]->read_dat; - $_[0]->{' read'} = 1; -} - - -=head2 $t->out_xml($context, $depth) - -Outputs Prep program as XML - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($fh) = $context->{'fh'}; - my ($dat); - - $self->read; - $dat = Font::TTF::Utils::XML_binhint($self->{' dat'}); - $dat =~ s/\n(?!$)/\n$depth$context->{'indent'}/omg; - $fh->print("$depth\n"); - $fh->print("$depth$context->{'indent'}$dat"); - $fh->print("$depth\n"); - $self; -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Parse all that hinting code - -=cut - -sub XML_end -{ - my ($self) = shift; - my ($context, $tag, %attrs) = @_; - - if ($tag eq 'code') - { - $self->{' dat'} = Font::TTF::Utils::XML_hintbin($context->{'text'}); - return $context; - } else - { return $self->SUPER::XML_end(@_); } -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prop.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prop.pm deleted file mode 100644 index b74c654..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Prop.pm +++ /dev/null @@ -1,154 +0,0 @@ -package Font::TTF::Prop; - -=head1 NAME - -Font::TTF::Prop - Glyph Properties table in a font - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=item version - -=item default - -=item lookup - -Hash of property values keyed by glyph number - -=item lookupFormat - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -use Font::TTF::Utils; -use Font::TTF::AATutils; -use Font::TTF::Segarr; - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $fh); - my ($version, $lookupPresent, $default); - - $self->SUPER::read or return $self; - - $fh = $self->{' INFILE'}; - $fh->read($dat, 8); - ($version, $lookupPresent, $default) = TTF_Unpack("vSS", $dat); - - if ($lookupPresent) { - my ($format, $lookup) = AAT_read_lookup($fh, 2, $self->{' LENGTH'} - 8, $default); - $self->{'lookup'} = $lookup; - $self->{'format'} = $format; - } - - $self->{'version'} = $version; - $self->{'default'} = $default; - - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($default, $lookup); - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $default = $self->{'default'}; - $lookup = $self->{'lookup'}; - $fh->print(TTF_Pack("vSS", $self->{'version'}, (defined $lookup ? 1 : 0), $default)); - - AAT_write_lookup($fh, $self->{'format'}, $lookup, 2, $default) if (defined $lookup); -} - -=head2 $t->print($fh) - -Prints a human-readable representation of the table - -=cut - -sub print -{ - my ($self, $fh) = @_; - my ($lookup); - - $self->read; - - $fh = 'STDOUT' unless defined $fh; - - $fh->printf("version %f\ndefault %04x # %s\n", $self->{'version'}, $self->{'default'}, meaning_($self->{'default'})); - $lookup = $self->{'lookup'}; - if (defined $lookup) { - $fh->printf("format %d\n", $self->{'format'}); - foreach (sort { $a <=> $b } keys %$lookup) { - $fh->printf("\t%d -> %04x # %s\n", $_, $lookup->{$_}, meaning_($lookup->{$_})); - } - } -} - -sub meaning_ -{ - my ($val) = @_; - my ($res); - - my @types = ( - "Strong left-to-right", - "Strong right-to-left", - "Arabic letter", - "European number", - "European number separator", - "European number terminator", - "Arabic number", - "Common number separator", - "Block separator", - "Segment separator", - "Whitespace", - "Other neutral"); - $res = $types[$val & 0x001f] or ("Undefined [" . ($val & 0x001f) . "]"); - - $res .= ", floater" if $val & 0x8000; - $res .= ", hang left" if $val & 0x4000; - $res .= ", hang right" if $val & 0x2000; - $res .= ", attaches on right" if $val & 0x0080; - $res .= ", pair" if $val & 0x1000; - my $pairOffset = ($val & 0x0f00) >> 8; - $pairOffset = $pairOffset - 16 if $pairOffset > 7; - $res .= $pairOffset > 0 ? " +" . $pairOffset : $pairOffset < 0 ? " " . $pairOffset : ""; - - $res; -} - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Jonathan Kew L. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Segarr.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Segarr.pm deleted file mode 100644 index 980188d..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Segarr.pm +++ /dev/null @@ -1,376 +0,0 @@ -package Font::TTF::Segarr; - -=head1 NAME - -Font::TTF::Segarr - Segmented array - -=head1 DESCRIPTION - -Holds data either directly or indirectly as a series of arrays. This class -looks after the set of arrays and masks the individual sub-arrays, thus saving -a class, we hope. - -=head1 INSTANCE VARIABLES - -All instance variables do not start with a space. - -The segmented array is simply an array of segments - -Each segment is a more complex affair: - -=over 4 - -=item START - -In terms of the array, the address for the 0th element in this segment. - -=item LEN - -Number of elements in this segment - -=item VAL - -The array which contains the elements - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@types $VERSION); -$VERSION = 0.0001; - -@types = ('', 'C', 'n', '', 'N'); - -=head2 Font::TTF::Segarr->new($size) - -Creates a new segmented array with a given data size - -=cut - -sub new -{ - my ($class) = @_; - my ($self) = []; - - bless $self, (ref($class) || $class); -} - - -=head2 $s->fastadd_segment($start, $is_sparse, @dat) - -Creates a new segment and adds it to the array assuming no overlap between -the new segment and any others in the array. $is_sparse indicates whether the -passed in array contains Cs or not. If false no checking is done (which -is faster, but riskier). If equal to 2 then 0 is considered undef as well. - -Returns the number of segments inserted. - -=cut - -sub fastadd_segment -{ - my ($self) = shift; - my ($start) = shift; - my ($sparse) = shift; - my ($p, $i, $seg, @seg); - - - if ($sparse) - { - for ($i = 0; $i <= $#_; $i++) - { - if (!defined $seg && (($sparse != 2 && defined $_[$i]) || $_[$i] != 0)) - { $seg->{'START'} = $start + $i; $seg->{'VAL'} = []; } - - if (defined $seg && (($sparse == 2 && $_[$i] == 0) || !defined $_[$i])) - { - $seg->{'LEN'} = $start + $i - $seg->{'START'}; - push(@seg, $seg); - $seg = undef; - } elsif (defined $seg) - { push (@{$seg->{'VAL'}}, $_[$i]); } - } - if (defined $seg) - { - push(@seg, $seg); - $seg->{'LEN'} = $start + $i - $seg->{'START'}; - } - } else - { - $seg->{'START'} = $start; - $seg->{'LEN'} = $#_ + 1; - $seg->{'VAL'} = [@_]; - @seg = ($seg); - } - - for ($i = 0; $i <= $#$self; $i++) - { - if ($self->[$i]{'START'} > $start) - { - splice(@$self, $i, 0, @seg); - return wantarray ? @seg : scalar(@seg); - } - } - push(@$self, @seg); - return wantarray ? @seg : scalar(@seg); -} - - -=head2 $s->add_segment($start, $overwrite, @dat) - -Creates a new segment and adds it to the array allowing for possible overlaps -between the new segment and the existing ones. In the case of overlaps, elements -from the new segment are deleted unless $overwrite is set in which case the -elements already there are over-written. - -This method also checks the data coming in to see if it is sparse (i.e. contains -undef values). Gaps cause new segments to be created or not to over-write existing -values. - -=cut - -sub add_segment -{ - my ($self) = shift; - my ($start) = shift; - my ($over) = shift; - my ($seg, $i, $s, $offset, $j, $newi); - - return $self->fastadd_segment($start, $over, @_) if ($#$self < 0); - $offset = 0; - for ($i = 0; $i <= $#$self && $offset <= $#_; $i++) - { - $s = $self->[$i]; - if ($s->{'START'} <= $start + $offset) # only < for $offset == 0 - { - if ($s->{'START'} + $s->{'LEN'} > $start + $#_) - { - for ($j = $offset; $j <= $#_; $j++) - { - if ($over) - { $s->{'VAL'}[$start - $s->{'START'} + $j] = $_[$j] if defined $_[$j]; } - else - { $s->{'VAL'}[$start - $s->{'START'} + $j] ||= $_[$j] if defined $_[$j]; } - } - $offset = $#_ + 1; - last; - } elsif ($s->{'START'} + $s->{'LEN'} > $start + $offset) # is $offset needed here? - { - for ($j = $offset; $j < $s->{'START'} + $s->{'LEN'} - $start; $j++) - { - if ($over) - { $s->{'VAL'}[$start - $s->{'START'} + $j] = $_[$j] if defined $_[$j]; } - else - { $s->{'VAL'}[$start - $s->{'START'} + $j] ||= $_[$j] if defined $_[$j]; } - } - $offset = $s->{'START'} + $s->{'LEN'} - $start; - } - } else # new seg please - { - if ($s->{'START'} > $start + $#_ + 1) - { - $i += $self->fastadd_segment($start + $offset, 1, @_[$offset .. $#_]) - 1; - $offset = $#_ + 1; - } - else - { - $i += $self->fastadd_segment($start + $offset, 1, @_[$offset .. $s->{'START'} - $start]) - 1; - $offset = $s->{'START'} - $start + 1; - } - } - } - if ($offset <= $#_) - { - $seg->{'START'} = $start + $offset; - $seg->{'LEN'} = $#_ - $offset + 1; - $seg->{'VAL'} = [@_[$offset .. $#_]]; - push (@$self, $seg); - } - $self->tidy; -} - - -=head2 $s->tidy - -Merges any immediately adjacent segments - -=cut - -sub tidy -{ - my ($self) = @_; - my ($i, $sl, $s); - - for ($i = 1; $i <= $#$self; $i++) - { - $sl = $self->[$i - 1]; - $s = $self->[$i]; - if ($s->{'START'} == $sl->{'START'} + $sl->{'LEN'}) - { - $sl->{'LEN'} += $s->{'LEN'}; - push (@{$sl->{'VAL'}}, @{$s->{'VAL'}}); - splice(@$self, $i, 1); - $i--; - } - } - $self; -} - - -=head2 $s->at($addr, [$len]) - -Looks up the data held at the given address by locating the appropriate segment -etc. If $len > 1 then returns an array of values, spaces being filled with undef. - -=cut - -sub at -{ - my ($self, $addr, $len) = @_; - my ($i, $dat, $s, @res, $offset); - - $len = 1 unless defined $len; - $offset = 0; - for ($i = 0; $i <= $#$self; $i++) - { - $s = $self->[$i]; - next if ($s->{'START'} + $s->{'LEN'} < $addr + $offset); # only fires on $offset == 0 - if ($s->{'START'} > $addr + $offset) - { - push (@res, (undef) x ($s->{'START'} > $addr + $len ? - $len - $offset : $s->{'START'} - $addr - $offset)); - $offset = $s->{'START'} - $addr; - } - last if ($s->{'START'} >= $addr + $len); - - if ($s->{'START'} + $s->{'LEN'} >= $addr + $len) - { - push (@res, @{$s->{'VAL'}}[$addr + $offset - $s->{'START'} .. - $addr + $len - $s->{'START'} - 1]); - $offset = $len; - last; - } else - { - push (@res, @{$s->{'VAL'}}[$addr + $offset - $s->{'START'} .. $s->{'LEN'} - 1]); - $offset = $s->{'START'} + $s->{'LEN'} - $addr; - } - } - push (@res, (undef) x ($len - $offset)) if ($offset < $len); - return wantarray ? @res : $res[0]; -} - - -=head2 $s->remove($addr, [$len]) - -Removes the item or items from addr returning them as an array or the first -value in a scalar context. This is very like C, including padding with -undef, but it deletes stuff as it goes. - -=cut - -sub remove -{ - my ($self, $addr, $len) = @_; - my ($i, $dat, $s, @res, $offset); - - $len = 1 unless defined $len; - $offset = 0; - for ($i = 0; $i <= $#$self; $i++) - { - $s = $self->[$i]; - next if ($s->{'START'} + $s->{'LEN'} < $addr + $offset); - if ($s->{'START'} > $addr + $offset) - { - push (@res, (undef) x ($s->{'START'} > $addr + $len ? - $len - $offset : $s->{'START'} - $addr - $offset)); - $offset = $s->{'START'} - $addr; - } - last if ($s->{'START'} >= $addr + $len); - - unless ($s->{'START'} == $addr + $offset) - { - my ($seg) = {}; - - $seg->{'START'} = $s->{'START'}; - $seg->{'LEN'} = $addr + $offset - $s->{'START'}; - $seg->{'VAL'} = [splice(@{$s->{'VAL'}}, 0, $addr + $offset - $s->{'START'})]; - $s->{'LEN'} -= $addr + $offset - $s->{'START'}; - $s->{'START'} = $addr + $offset; - - splice(@$self, $i, 0, $seg); - $i++; - } - - if ($s->{'START'} + $s->{'LEN'} >= $addr + $len) - { - push (@res, splice(@{$s->{'VAL'}}, 0, $len - $offset)); - $s->{'LEN'} -= $len - $offset; - $s->{'START'} += $len - $offset; - $offset = $len; - last; - } else - { - push (@res, @{$s->{'VAL'}}); - $offset = $s->{'START'} + $s->{'LEN'} - $addr; - splice(@$self, $i, 0); - $i--; - } - } - push (@res, (undef) x ($len - $offset)) if ($offset < $len); - return wantarray ? @res : $res[0]; -} - - -=head2 $s->copy - -Deep copies this array - -=cut - -sub copy -{ - my ($self) = @_; - my ($res, $p); - - $res = []; - foreach $p (@$self) - { push (@$res, $self->copy_seg($p)); } - $res; -} - - -=head2 $s->copy_seg($seg) - -Creates a deep copy of a segment - -=cut - -sub copy_seg -{ - my ($self, $seg) = @_; - my ($p, $res); - - $res = {}; - $res->{'VAL'} = [@{$seg->{'VAL'}}]; - foreach $p (keys %$seg) - { $res->{$p} = $seg->{$p} unless defined $res->{$p}; } - $res; -} - - -1; - -=head1 BUGS - -No known bugs. - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Sill.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Sill.pm deleted file mode 100644 index 6a17af1..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Sill.pm +++ /dev/null @@ -1,114 +0,0 @@ -package Font::TTF::Sill; - -=head1 NAME - -Font::TTF::Sill - Graphite language mapping table - -=head1 DESCRIPTION - -=head1 INSTANCE VARIABLES - -=over 4 - -=item version - -Table version number. - -=item langs - -Contains a hash where the key is the language id and the value is an array of -language records - -=back - -=head2 Language Records - -Each language record is itself an array of two values [fid, val]. fid is the -feature id and is held as a long. - -=cut - -use Font::TTF::Utils; -require Font::TTF::Table; - -@ISA = qw(Font::TTF::Table); - -sub read -{ - my ($self) = @_; - my ($num, $i, $j); - - return $self if ($self->{' read'}); - $self->SUPER::read_dat or return $self; - - ($self->{'version'}, $num) = TTF_Unpack("vS", $self->{' dat'}); - - foreach $i (1 .. $num) # ignore bogus entry at end - { - my ($lid, $numf, $offset) = unpack("A4nn", substr($self->{' dat'}, $i * 8 + 4)); # 12 - 8 = 4 since i starts at 1. A4 strips nulls - my (@settings); - - foreach $j (1 .. $numf) - { - my ($fid, $val) = TTF_Unpack("Ls", substr($self->{' dat'}, $offset + $j * 8 - 8)); - push (@settings, [$fid, $val]); - } - $self->{'langs'}{$lid} = [@settings]; - } - delete $self->{' dat'}; - $self->{' read'} = 1; - $self; -} - -sub out -{ - my ($self, $fh) = @_; - my ($num, $range, $select, $shift) = TTF_bininfo(scalar keys %{$self->{'langs'}}, 1); - my ($offset) = $num * 8 + 20; #header = 12, dummy = 8 - my ($k, $s); - - return $self->SUPER::out($fh) unless ($self->{' read'}); - $fh->print(TTF_Pack("vSSSS", $self->{'version'}, $num, $range, $select, $shift)); - foreach $k (sort (keys %{$self->{'langs'}}), '+1') - { - my ($numf) = scalar @{$self->{'langs'}{$k}} unless ($k eq '+1'); - $fh->print(pack("a4nn", $k, $numf, $offset)); - $offset += $numf * 8; - } - - foreach $k (sort keys %{$self->{'langs'}}) - { - foreach $s (@{$self->{'langs'}{$k}}) - { $fh->print(TTF_Pack("LsS", @{$s}, 0)); } - } - $self; -} - -sub XML_element -{ - my ($self) = shift; - my ($context, $depth, $key, $dat) = @_; - my ($fh) = $context->{'fh'}; - my ($k, $s); - - return $self->SUPER::XML_element(@_) unless ($key eq 'langs'); - foreach $k (sort keys %{$self->{'langs'}}) - { - $fh->printf("%s\n", $depth, $k); - foreach $s (@{$self->{'langs'}{$k}}) - { - my ($fid) = $s->[0]; - if ($fid > 0x00FFFFFF) - { $fid = unpack("A4", pack ("N", $fid)); } - else - { $fid = sprintf("%d", $fid); } - $fh->printf("%s%s\n", - $depth, $context->{'indent'}, $fid, $s->[1]); - } - $fh->printf("%s\n", $depth); - } - $self; -} -1; - - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Table.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Table.pm deleted file mode 100644 index bbdb48d..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Table.pm +++ /dev/null @@ -1,382 +0,0 @@ -package Font::TTF::Table; - -=head1 NAME - -Font::TTF::Table - Superclass for tables and used for tables we don't have a class for - -=head1 DESCRIPTION - -Looks after the purely table aspects of a TTF table, such as whether the table -has been read before, locating the file pointer, etc. Also copies tables from -input to output. - -=head1 INSTANCE VARIABLES - -Instance variables start with a space - -=over 4 - -=item read - -Flag which indicates that the table has already been read from file. - -=item dat - -Allows the creation of unspecific tables. Data is simply output to any font -file being created. - -=item INFILE - -The read file handle - -=item OFFSET - -Location of the file in the input file - -=item LENGTH - -Length in the input directory - -=item CSUM - -Checksum read from the input file's directory - -=item PARENT - -The L that table is part of - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw($VERSION); -use Font::TTF::Utils; - -$VERSION = 0.0001; - -=head2 Font::TTF::Table->new(%parms) - -Creates a new table or subclass. Table instance variables are passed in -at this point as an associative array. - -=cut - -sub new -{ - my ($class, %parms) = @_; - my ($self) = {}; - my ($p); - - $class = ref($class) || $class; - foreach $p (keys %parms) - { $self->{" $p"} = $parms{$p}; } - bless $self, $class; -} - - -=head2 $t->read - -Reads the table from the input file. Acts as a superclass to all true tables. -This method marks the table as read and then just sets the input file pointer -but does not read any data. If the table has already been read, then returns -C else returns C<$self> - -=cut - -sub read -{ - my ($self) = @_; - - return $self->read_dat if (ref($self) eq "Font::TTF::Table"); - return undef if $self->{' read'}; - $self->{' INFILE'}->seek($self->{' OFFSET'}, 0); - $self->{' read'} = 1; - $self; -} - - -=head2 $t->read_dat - -Reads the table into the C instance variable for those tables which don't -know any better - -=cut - -sub read_dat -{ - my ($self) = @_; - -# can't just $self->read here otherwise those tables which start their read sub with -# $self->read_dat are going to permanently loop - return undef if ($self->{' read'}); -# $self->{' read'} = 1; # Let read do this, now out will call us for subclasses - $self->{' INFILE'}->seek($self->{' OFFSET'}, 0); - $self->{' INFILE'}->read($self->{' dat'}, $self->{' LENGTH'}); - $self; -} - -=head2 $t->out($fh) - -Writes out the table to the font file. If there is anything in the -C instance variable then this is output, otherwise the data is copied -from the input file to the output - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($dat, $i, $len, $count); - - if (defined $self->{' dat'}) - { - $fh->print($self->{' dat'}); - return $self; - } - - return undef unless defined $self->{' INFILE'}; - $self->{' INFILE'}->seek($self->{' OFFSET'}, 0); - $len = $self->{' LENGTH'}; - while ($len > 0) - { - $count = ($len > 4096) ? 4096 : $len; - $self->{' INFILE'}->read($dat, $count); - $fh->print($dat); - $len -= $count; - } - $self; -} - - -=head2 $t->out_xml($context) - -Outputs this table in XML format. The table is first read (if not already read) and then if -there is no subclass, then the data is dumped as hex data - -=cut - -sub out_xml -{ - my ($self, $context, $depth) = @_; - my ($k); - - if (ref($self) eq __PACKAGE__) - { - $self->read_dat; - Font::TTF::Utils::XML_hexdump($context, $depth, $self->{' dat'}); - } - else - { - $self->read; - foreach $k (sort grep {$_ !~ m/^\s/o} keys %{$self}) - { - $self->XML_element($context, $depth, $k, $self->{$k}); - } - } - $self; -} - - -=head2 $t->XML_element - -Output a particular element based on its contents. - -=cut - -sub XML_element -{ - my ($self, $context, $depth, $k, $dat) = @_; - my ($fh) = $context->{'fh'}; - my ($ndepth, $d); - - return unless defined $dat; - - if (!ref($dat)) - { - $fh->printf("%s<%s>%s\n", $depth, $k, $dat, $k); - return $self; - } - - $fh->printf("%s<%s>\n", $depth, $k); - $ndepth = $depth . $context->{'indent'}; - - if (ref($dat) eq 'SCALAR') - { $self->XML_element($context, $ndepth, 'scalar', $$dat); } - elsif (ref($dat) eq 'ARRAY') - { - foreach $d (@{$dat}) - { $self->XML_element($context, $ndepth, 'elem', $d); } - } - elsif (ref($dat) eq 'HASH') - { - foreach $d (sort grep {$_ !~ m/^\s/o} keys %{$dat}) - { $self->XML_element($context, $ndepth, $d, $dat->{$d}); } - } - else - { - $context->{'name'} = ref($dat); - $context->{'name'} =~ s/^.*://o; - $dat->out_xml($context, $ndepth); - } - - $fh->printf("%s\n", $depth, $k); - $self; -} - - -=head2 $t->XML_end($context, $tag, %attrs) - -Handles the default type of for those tables which aren't subclassed - -=cut - -sub XML_end -{ - my ($self, $context, $tag, %attrs) = @_; - my ($dat, $addr); - - return undef unless ($tag eq 'data'); - $dat = $context->{'text'}; - $dat =~ s/([0-9a-f]{2})\s*/hex($1)/oig; - if (defined $attrs{'addr'}) - { $addr = hex($attrs{'addr'}); } - else - { $addr = length($self->{' dat'}); } - substr($self->{' dat'}, $addr, length($dat)) = $dat; - return $context; -} - - -=head2 $t->dirty($val) - -This sets the dirty flag to the given value or 1 if no given value. It returns the -value of the flag - -=cut - -sub dirty -{ - my ($self, $val) = @_; - my ($res) = $self->{' isDirty'}; - - $self->{' isDirty'} = defined $val ? $val : 1; - $res; -} - -=head2 $t->update - -Each table knows how to update itself. This consists of doing whatever work -is required to ensure that the memory version of the table is consistent -and that other parameters in other tables have been updated accordingly. -I.e. by the end of sending C to all the tables, the memory version -of the font should be entirely consistent. - -Some tables which do no work indicate to themselves the need to update -themselves by setting isDirty above 1. This method resets that accordingly. - -=cut - -sub update -{ - my ($self) = @_; - - if ($self->{' isDirty'}) - { - $self->read; - $self->{' isDirty'} = 0; - return $self; - } - else - { return undef; } -} - - -=head2 $t->empty - -Clears a table of all data to the level of not having been read - -=cut - -sub empty -{ - my ($self) = @_; - my (%keep); - - foreach (qw(INFILE LENGTH OFFSET CSUM PARENT)) - { $keep{" $_"} = 1; } - - map {delete $self->{$_} unless $keep{$_}} keys %$self; - $self; -} - - -=head2 $t->release - -Releases ALL of the memory used by this table, and all of its component/child -objects. This method is called automatically by -'Font::TTF::Font-Erelease' (so you don't have to call it yourself). - -B, that it is important that this method get called at some point prior -to the actual destruction of the object. Internally, we track things in a -structure that can result in circular references, and without calling -'C' these will not properly get cleaned up by Perl. Once this -method has been called, though, don't expect to be able to do anything with the -C object; it'll have B internal state whatsoever. - -B As part of the brute-force cleanup done here, this method -will throw a warning message whenever unexpected key values are found within -the C object. This is done to help ensure that any -unexpected and unfreed values are brought to your attention so that you can bug -us to keep the module updated properly; otherwise the potential for memory -leaks due to dangling circular references will exist. - -=cut - -sub release -{ - my ($self) = @_; - -# delete stuff that we know we can, here - - my @tofree = map { delete $self->{$_} } keys %{$self}; - - while (my $item = shift @tofree) - { - my $ref = ref($item); - if (UNIVERSAL::can($item, 'release')) - { $item->release(); } - elsif ($ref eq 'ARRAY') - { push( @tofree, @{$item} ); } - elsif (UNIVERSAL::isa($ref, 'HASH')) - { release($item); } - } - -# check that everything has gone - it better had! - foreach my $key (keys %{$self}) - { warn ref($self) . " still has '$key' key left after release.\n"; } -} - - -sub __dumpvar__ -{ - my ($self, $key) = @_; - - return ($key eq ' PARENT' ? '...parent...' : $self->{$key}); -} - -1; - -=head1 BUGS - -No known bugs - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttc.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttc.pm deleted file mode 100644 index b3eeef0..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttc.pm +++ /dev/null @@ -1,164 +0,0 @@ -package Font::TTF::Ttc; - -=head1 NAME - -Font::TTF::Ttc - Truetype Collection class - -=head1 DESCRIPTION - -A TrueType collection is a collection of TrueType fonts in one file in which -tables may be shared between different directories. In order to support this, -the TTC introduces the concept of a table being shared by different TrueType -fonts. This begs the question of what should happen to the ' PARENT' property -of a particular table. It is made to point to the first directory object which -refers to it. It is therefore up to the application to sort out any confusion. -Confusion only occurs if shared tables require access to non-shared tables. -This should not happen since the shared tables are dealing with glyph -information only and the private tables are dealing with encoding and glyph -identification. Thus the general direction is from identification to glyph and -not the other way around (at least not without knowledge of the particular -context). - -=head1 INSTANCE VARIABLES - -The following instance variables are preceded by a space - -=over 4 - -=item fname (P) - -Filename for this TrueType Collection - -=item INFILE (P) - -The filehandle of this collection - -=back - -The following instance variable does not start with a space - -=over 4 - -=item directs - -An array of directories (Font::TTF::Font objects) for each sub-font in the directory - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw($VERSION); - -use IO::File; - -$VERSION = 0.0001; - -=head2 Font::TTF::Ttc->open($fname) - -Opens and reads the given filename as a TrueType Collection. Reading a collection -involves reading each of the directories which go to make up the collection. - -=cut - -sub open -{ - my ($class, $fname) = @_; - my ($self) = {}; - my ($fh); - - unless (ref($fname)) - { - $fh = IO::File->new($fname) or return undef; - binmode $fh; - } else - { $fh = $fname; } - - bless $self, $class; - $self->{' INFILE'} = $fh; - $self->{' fname'} = $fname; - $fh->seek(0, 0); - $self->read; -} - - -=head2 $c->read - -Reads a Collection by reading all the directories in the collection - -=cut - -sub read -{ - my ($self) = @_; - my ($fh) = $self->{' INFILE'}; - my ($dat, $ttc, $ver, $num, $i, $loc); - - $fh->read($dat, 12); - ($ttc, $ver, $num) = unpack("A4N2", $dat); - - return undef unless $ttc eq "ttcf"; - $fh->read($dat, $num << 2); - for ($i = 0; $i < $num; $i++) - { - $loc = unpack("N", substr($dat, $i << 2, 4)); - $self->{'directs'}[$i] = Font::TTF::Font->new('INFILE' => $fh, - 'PARENT' => $self, - 'OFFSET' => $loc) || return undef; - } - for ($i = 0; $i < $num; $i++) - { $self->{'directs'}[$i]->read; } - $self; -} - - -=head2 $c->find($direct, $name, $check, $off, $len) - -Hunts around to see if a table with the given characteristics of name, checksum, -offset and length has been associated with a directory earlier in the list. -Actually on checks the offset since no two tables can share the same offset in -a TrueType font, collection or otherwise. - -=cut - -sub find -{ - my ($self, $direct, $name, $check, $off, $len) = @_; - my ($d); - - foreach $d (@{$self->{'directs'}}) - { - return undef if $d eq $direct; - next unless defined $d->{$name}; - return $d->{$name} if ($d->{$name}{' OFFSET'} == $off); - } - undef; # wierd that the font passed is not in the list! -} - - -=head2 $c->DESTROY - -Closees any opened files by us - -=cut - -sub DESTROY -{ - my ($self) = @_; - close ($self->{' INFILE'}); - undef; -} - -=head1 BUGS - -No known bugs, but then not ever executed! - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttopen.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttopen.pm deleted file mode 100644 index 610a66e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Ttopen.pm +++ /dev/null @@ -1,1223 +0,0 @@ -package Font::TTF::Ttopen; - -=head1 NAME - -Font::TTF::Ttopen - Opentype superclass for standard Opentype lookup based tables -(GSUB and GPOS) - -=head1 DESCRIPTION - -Handles all the script, lang, feature, lookup stuff for a -L/L table leaving the class specifics to the -subclass - -=head1 INSTANCE VARIABLES - -The instance variables of an opentype table form a complex sub-module hierarchy. - -=over 4 - -=item Version - -This contains the version of the table as a floating point number - -=item SCRIPTS - -The scripts list is a hash of script tags. Each script tag (of the form -$t->{'SCRIPTS'}{$tag}) has information below it. - -=over 8 - -=item OFFSET - -This variable is preceeded by a space and gives the offset from the start of the -table (not the table section) to the script table for this script - -=item REFTAG - -This variable is preceded by a space and gives a corresponding script tag to this -one such that the offsets in the file are the same. When writing, it is up to the -caller to ensure that the REFTAGs are set correctly, since these will be used to -assume that the scripts are identical. Note that REFTAG must refer to a script which -has no REFTAG of its own. - -=item DEFAULT - -This corresponds to the default language for this script, if there is one, and -contains the same information as an itemised language - -=item LANG_TAGS - -This contains an array of language tag strings (each 4 bytes) corresponding to -the languages listed by this script - -=item $lang - -Each language is a hash containing its information: - -=over 12 - -=item OFFSET - -This variable is preceeded by a a space and gives the offset from the start of -the whole table to the language table for this language - -=item REFTAG - -This variable is preceded by a space and has the same function as for the script -REFTAG, only for the languages within a script. - -=item RE-ORDER - -This indicates re-ordering information, and has not been set. The value should -always be 0. - -=item DEFAULT - -This holds the index of the default feature, if there is one, or -1 otherwise. - -=item FEATURES - -This is an array of feature tags for all the features enabled for this language - -=back - -=back - -=item FEATURES - -The features section of instance variables corresponds to the feature table in -the opentype table. - -=over 8 - -=item FEAT_TAGS - -This array gives the ordered list of feature tags for this table. It is used during -reading and writing for converting between feature index and feature tag. - -=back - -The rest of the FEATURES variable is itself a hash based on the feature tag for -each feature. Each feature has the following structure: - -=over 8 - -=item OFFSET - -This attribute is preceeded by a space and gives the offset relative to the start of the whole -table of this particular feature. - -=item PARMS - -This is an unused offset to the parameters for each feature - -=item LOOKUPS - -This is an array containing indices to lookups in the LOOKUP instance variable of the table - -=item INDEX - -This gives the feature index for this feature and is used during reading and writing for -converting between feature tag and feature index. - -=back - -=item LOOKUP - -This variable is an array of lookups in order and is indexed via the features of a language of a -script. Each lookup contains subtables and other information: - -=over 8 - -=item OFFSET - -This name is preceeded by a space and contains the offset from the start of the table to this -particular lookup - -=item TYPE - -This is a subclass specific type for a lookup. It stipulates the type of lookup and hence subtables -within the lookup - -=item FLAG - -Holds the lookup flag bits - -=item SUB - -This holds an array of subtables which are subclass specific. Each subtable must have -an OFFSET. The other variables described here are an abstraction used in both the -GSUB and GPOS tables which are the target subclasses of this class. - -=over 12 - -=item OFFSET - -This is preceeded by a space and gives the offset relative to the start of the table for this -subtable - -=item FORMAT - -Gives the sub-table sub format for this GSUB subtable. It is assumed that this -value is correct when it comes time to write the subtable. - -=item COVERAGE - -Most lookups consist of a coverage table corresponding to the first -glyph to match. The offset of this coverage table is stored here and the coverage -table looked up against the GSUB table proper. There are two lookups -without this initial coverage table which is used to index into the RULES array. -These lookups have one element in the RULES array which is used for the whole -match. - -=item RULES - -The rules are a complex array. Each element of the array corresponds to an -element in the coverage table (governed by the coverage index). If there is -no coverage table, then there is considered to be only one element in the rules -array. Each element of the array is itself an array corresponding to the -possibly multiple string matches which may follow the initial glyph. Each -element of this array is a hash with fixed keys corresponding to information -needed to match a glyph string or act upon it. Thus the RULES element is an -array of arrays of hashes which contain the following keys: - -=over 16 - -=item MATCH - -This contains a sequence of elements held as an array. The elements may be -glyph ids (gid), class ids (cids), or offsets to coverage tables. Each element -corresponds to one glyph in the glyph string. See MATCH_TYPE for details of -how the different element types are marked. - -=item PRE - -This array holds the sequence of elements preceeding the first match element -and has the same form as the MATCH array. - -=item POST - -This array holds the sequence of elements to be tested for following the match -string and is of the same form as the MATCH array. - -=item ACTION - -This array holds information regarding what should be done if a match is found. -The array may either hold glyph ids (which are used to replace or insert or -whatever glyphs in the glyph string) or 2 element arrays consisting of: - -=over 20 - -=item OFFSET - -Offset from the start of the matched string that the lookup should start at -when processing the substring. - -=item LOOKUP_INDEX - -The index to a lookup to be acted upon on the match string. - -=back - -=back - -=back - -=back - -=item CLASS - -For those lookups which use class categories rather than glyph ids for matching -this is the offset to the class definition used to categories glyphs in the -match string. - -=item PRE_CLASS - -This is the offset to the class definition for the before match glyphs - -=item POST_CLASS - -This is the offset to the class definition for the after match glyphs. - -=item ACTION_TYPE - -This string holds the type of information held in the ACTION variable of a RULE. -It is subclass specific. - -=item MATCH_TYPE - -This holds the type of information in the MATCH array of a RULE. This is subclass -specific. - -=item ADJUST - -This corresponds to a single action for all items in a coverage table. The meaning -is subclass specific. - -=item CACHE - -This key starts with a space - -A hash of other tables (such as coverage tables, classes, anchors, device tables) -based on the offset given in the subtable to that other information. -Note that the documentation is particularly -unhelpful here in that such tables are given as offsets relative to the -beginning of the subtable not the whole GSUB table. This includes those items which -are stored relative to another base within the subtable. - -=back - - -=head1 METHODS - -=cut - -use Font::TTF::Table; -use Font::TTF::Utils; -use Font::TTF::Coverage; -use strict; -use vars qw(@ISA); - -@ISA = qw(Font::TTF::Table); - -=head2 $t->read - -Reads the table passing control to the subclass to handle the subtable specifics - -=cut - -sub read -{ - my ($self) = @_; - my ($dat, $i, $l, $oScript, $oFeat, $oLook, $tag, $nScript, $off, $dLang, $nLang, $lTag); - my ($nFeat, $nLook, $nSub, $j, $temp); - my ($fh) = $self->{' INFILE'}; - my ($moff) = $self->{' OFFSET'}; - - $self->SUPER::read or return $self; - $fh->read($dat, 10); - ($self->{'Version'}, $oScript, $oFeat, $oLook) = TTF_Unpack("vSSS", $dat); - -# read features first so that in the script/lang hierarchy we can use feature tags - - $fh->seek($moff + $oFeat, 0); - $fh->read($dat, 2); - $nFeat = unpack("n", $dat); - $self->{'FEATURES'} = {}; - $l = $self->{'FEATURES'}; - $fh->read($dat, 6 * $nFeat); - for ($i = 0; $i < $nFeat; $i++) - { - ($tag, $off) = unpack("a4n", substr($dat, $i * 6, 6)); - while (defined $l->{$tag}) - { - if ($tag =~ m/(.*?)\s_(\d+)$/o) - { $tag = $1 . " _" . ($2 + 1); } - else - { $tag .= " _0"; } - } - $l->{$tag}{' OFFSET'} = $off + $oFeat; - $l->{$tag}{'INDEX'} = $i; - push (@{$l->{'FEAT_TAGS'}}, $tag); - } - - foreach $tag (grep {m/^.{4}(?:\s_\d+)?$/o} keys %$l) - { - $fh->seek($moff + $l->{$tag}{' OFFSET'}, 0); - $fh->read($dat, 4); - ($l->{$tag}{'PARMS'}, $nLook) = unpack("n2", $dat); - $fh->read($dat, $nLook * 2); - $l->{$tag}{'LOOKUPS'} = [unpack("n*", $dat)]; - } - -# Now the script/lang hierarchy - - $fh->seek($moff + $oScript, 0); - $fh->read($dat, 2); - $nScript = unpack("n", $dat); - $self->{'SCRIPTS'} = {}; - $l = $self->{'SCRIPTS'}; - $fh->read($dat, 6 * $nScript); - for ($i = 0; $i < $nScript; $i++) - { - ($tag, $off) = unpack("a4n", substr($dat, $i * 6, 6)); - $off += $oScript; - foreach (keys %$l) - { $l->{$tag}{' REFTAG'} = $_ if ($l->{$_}{' OFFSET'} == $off - && !defined $l->{$_}{' REFTAG'}); } - $l->{$tag}{' OFFSET'} = $off; - } - - foreach $tag (keys %$l) - { - next if ($l->{$tag}{' REFTAG'}); - $fh->seek($moff + $l->{$tag}{' OFFSET'}, 0); - $fh->read($dat, 4); - ($dLang, $nLang) = unpack("n2", $dat); - $l->{$tag}{'DEFAULT'}{' OFFSET'} = - $dLang + $l->{$tag}{' OFFSET'} if $dLang; - $fh->read($dat, 6 * $nLang); - for ($i = 0; $i < $nLang; $i++) - { - ($lTag, $off) = unpack("a4n", substr($dat, $i * 6, 6)); - $off += $l->{$tag}{' OFFSET'}; - $l->{$tag}{$lTag}{' OFFSET'} = $off; - foreach (@{$l->{$tag}{'LANG_TAGS'}}, 'DEFAULT') - { $l->{$tag}{$lTag}{' REFTAG'} = $_ if ($l->{$tag}{$_}{' OFFSET'} == $off - && !$l->{$tag}{$_}{' REFTAG'}); } - push (@{$l->{$tag}{'LANG_TAGS'}}, $lTag); - } - foreach $lTag (@{$l->{$tag}{'LANG_TAGS'}}, 'DEFAULT') - { - next unless defined $l->{$tag}{$lTag}; - next if ($l->{$tag}{$lTag}{' REFTAG'}); - $fh->seek($moff + $l->{$tag}{$lTag}{' OFFSET'}, 0); - $fh->read($dat, 6); - ($l->{$tag}{$lTag}{'RE-ORDER'}, $l->{$tag}{$lTag}{'DEFAULT'}, $nFeat) - = unpack("n3", $dat); - $fh->read($dat, $nFeat * 2); - $l->{$tag}{$lTag}{'FEATURES'} = [map {$self->{'FEATURES'}{'FEAT_TAGS'}[$_]} unpack("n*", $dat)]; - } - foreach $lTag (@{$l->{$tag}{'LANG_TAGS'}}, 'DEFAULT') - { - next unless $l->{$tag}{$lTag}{' REFTAG'}; - $temp = $l->{$tag}{$lTag}{' REFTAG'}; - $l->{$tag}{$lTag} = ©($l->{$tag}{$temp}); - $l->{$tag}{$lTag}{' REFTAG'} = $temp; - } - } - foreach $tag (keys %$l) - { - next unless $l->{$tag}{' REFTAG'}; - $temp = $l->{$tag}{' REFTAG'}; - $l->{$tag} = ©($l->{$temp}); - $l->{$tag}{' REFTAG'} = $temp; - } - -# And finally the lookups - - $fh->seek($moff + $oLook, 0); - $fh->read($dat, 2); - $nLook = unpack("n", $dat); - $fh->read($dat, $nLook * 2); - $i = 0; - map { $self->{'LOOKUP'}[$i++]{' OFFSET'} = $_; } unpack("n*", $dat); - - for ($i = 0; $i < $nLook; $i++) - { - $l = $self->{'LOOKUP'}[$i]; - $fh->seek($l->{' OFFSET'} + $moff + $oLook, 0); - $fh->read($dat, 6); - ($l->{'TYPE'}, $l->{'FLAG'}, $nSub) = unpack("n3", $dat); - $fh->read($dat, $nSub * 2); - $j = 0; - my @offsets = unpack("n*", $dat); - my $isExtension = ($l->{'TYPE'} == $self->extension()); - for ($j = 0; $j < $nSub; $j++) - { - $l->{'SUB'}[$j]{' OFFSET'} = $offsets[$j]; - $fh->seek($moff + $oLook + $l->{' OFFSET'} + $l->{'SUB'}[$j]{' OFFSET'}, 0); - if ($isExtension) - { - $fh->read($dat, 8); - my $longOff; - (undef, $l->{'TYPE'}, $longOff) = unpack("nnN", $dat); - $l->{'SUB'}[$j]{' OFFSET'} += $longOff; - $fh->seek($moff + $oLook + $l->{' OFFSET'} + $l->{'SUB'}[$j]{' OFFSET'}, 0); - } - $self->read_sub($fh, $l, $j); - } - } - return $self; -} - -=head2 $t->read_sub($fh, $lookup, $index) - -This stub is to allow subclasses to read subtables of lookups in a table specific manner. A -reference to the lookup is passed in along with the subtable index. The file is located at the -start of the subtable to be read - -=cut - -sub read_sub -{ } - - -=head2 $t->extension() - -Returns the lookup number for the extension table that allows access to 32-bit offsets. - -=cut - -sub extension -{ } - - -=head2 $t->out($fh) - -Writes this Opentype table to the output calling $t->out_sub for each sub table -at the appropriate point in the output. The assumption is that on entry the -number of scripts, languages, features, lookups, etc. are all resolved and -the relationships fixed. This includes a script's LANG_TAGS list and that all -scripts and languages in their respective dictionaries either have a REFTAG or contain -real data. - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($i, $j, $base, $off, $tag, $t, $l, $lTag, $oScript, @script, @tags); - my ($end, $nTags, @offs, $oFeat, $oLook, $nSub, $nSubs, $big, $out); - - return $self->SUPER::out($fh) unless $self->{' read'}; - -# First sort the features - $i = 0; - $self->{'FEATURES'}{'FEAT_TAGS'} = [sort grep {m/^.{4}(?:\s_\d+)?$/o} %{$self->{'FEATURES'}}] - if (!defined $self->{'FEATURES'}{'FEAT_TAGS'}); - foreach $t (@{$self->{'FEATURES'}{'FEAT_TAGS'}}) - { $self->{'FEATURES'}{$t}{'INDEX'} = $i++; } - - $base = $fh->tell(); - $fh->print(TTF_Pack("v", $self->{'Version'})); - $fh->print(pack("n3", 10, 0, 0)); - $oScript = $fh->tell() - $base; - @script = sort grep {length($_) == 4} keys %{$self->{'SCRIPTS'}}; - $fh->print(pack("n", $#script + 1)); - foreach $t (@script) - { $fh->print(pack("a4n", $t, 0)); } - - $end = $fh->tell(); - foreach $t (@script) - { - $fh->seek($end, 0); - $tag = $self->{'SCRIPTS'}{$t}; - next if ($tag->{' REFTAG'}); - $tag->{' OFFSET'} = tell($fh) - $base - $oScript; - $fh->print(pack("n2", 0, $#{$tag->{'LANG_TAGS'}} + 1)); - foreach $lTag (sort @{$tag->{'LANG_TAGS'}}) - { $fh->print(pack("a4n", $lTag, 0)); } - foreach $lTag (@{$tag->{'LANG_TAGS'}}, 'DEFAULT') - { - my ($def); - $l = $tag->{$lTag}; - next if (!defined $l || (defined $l->{' REFTAG'} && $l->{' REFTAG'} ne '')); - $l->{' OFFSET'} = $fh->tell() - $base - $oScript - $tag->{' OFFSET'}; - if (defined $l->{'DEFAULT'}) -# { $def = $self->{'FEATURES'}{$l->{'FEATURES'}[$l->{'DEFAULT'}]}{'INDEX'}; } - { $def = $l->{'DEFAULT'}; } - else - { $def = -1; } - $fh->print(pack("n*", $l->{'RE_ORDER'} || 0, $def, $#{$l->{'FEATURES'}} + 1, - map {$self->{'FEATURES'}{$_}{'INDEX'} || 0} @{$l->{'FEATURES'}})); - } - $end = $fh->tell(); - if ($tag->{'DEFAULT'}{' REFTAG'} || defined $tag->{'DEFAULT'}{'FEATURES'}) - { - $fh->seek($base + $oScript + $tag->{' OFFSET'}, 0); - if (defined $tag->{'DEFAULT'}{' REFTAG'}) - { - my ($ttag); - for ($ttag = $tag->{'DEFAULT'}{' REFTAG'}; defined $tag->{$ttag}{' REFTAG'}; $ttag = $tag->{$ttag}{' REFTAG'}) - { } - $off = $tag->{$ttag}{' OFFSET'}; - } - else - { $off = $tag->{'DEFAULT'}{' OFFSET'}; } - $fh->print(pack("n", $off)); - } - $fh->seek($base + $oScript + $tag->{' OFFSET'} + 4, 0); - foreach (sort @{$tag->{'LANG_TAGS'}}) - { - if (defined $tag->{$_}{' REFTAG'}) - { - my ($ttag); - for ($ttag = $tag->{$_}{' REFTAG'}; defined $tag->{$ttag}{' REFTAG'}; $ttag = $tag->{$ttag}{' REFTAG'}) - { } - $off = $tag->{$ttag}{' OFFSET'}; - } - else - { $off = $tag->{$_}{' OFFSET'}; } - $fh->print(pack("a4n", $_, $off)); - } - } - $fh->seek($base + $oScript + 2, 0); - foreach $t (@script) - { - $tag = $self->{'SCRIPTS'}{$t}; - $off = $tag->{' REFTAG'} ? $tag->{$tag->{' REFTAG'}}{' OFFSET'} : $tag->{' OFFSET'}; - $fh->print(pack("a4n", $t, $off)); - } - - $fh->seek($end, 0); - $oFeat = $end - $base; - $nTags = $#{$self->{'FEATURES'}{'FEAT_TAGS'}} + 1; - $fh->print(pack("n", $nTags)); - $fh->print(pack("a4n", " ", 0) x $nTags); - - foreach $t (@{$self->{'FEATURES'}{'FEAT_TAGS'}}) - { - $tag = $self->{'FEATURES'}{$t}; - $tag->{' OFFSET'} = tell($fh) - $base - $oFeat; - $fh->print(pack("n*", 0, $#{$tag->{'LOOKUPS'}} + 1, @{$tag->{'LOOKUPS'}})); - } - $end = $fh->tell(); - $fh->seek($oFeat + $base + 2, 0); - foreach $t (@{$self->{'FEATURES'}{'FEAT_TAGS'}}) - { $fh->print(pack("a4n", $t, $self->{'FEATURES'}{$t}{' OFFSET'})); } - - undef $big; - $fh->seek($end, 0); - $oLook = $end - $base; - - # Start Lookup List Table - $nTags = $#{$self->{'LOOKUP'}} + 1; - $fh->print(pack("n", $nTags)); - $fh->print(pack("n", 0) x $nTags); - $end = $fh->tell(); # end of LookupListTable = start of Lookups - foreach $tag (@{$self->{'LOOKUP'}}) - { $nSubs += $self->num_sub($tag); } - for ($i = 0; $i < $nTags; $i++) - { - $fh->seek($end, 0); - $tag = $self->{'LOOKUP'}[$i]; - $off = $end - $base - $oLook; # BH 2004-03-04 - # Is there room, from the start of this i'th lookup, for this and the remaining - # lookups to be wrapped in extension lookups? - if (!defined $big && $off + ($nTags - $i) * 6 + $nSubs * 10 > 65535) # BH 2004-03-04 - { - # Not enough room -- need to start an extension! - my ($k, $ext); - $ext = $self->extension(); - # Must turn previous lookup into the first extension - $i--; - $tag = $self->{'LOOKUP'}[$i]; - $end = $tag->{' OFFSET'} + $base + $oLook; - $fh->seek($end, 0); - $big = $i; - # For this and the remaining lookups, build extensions lookups - for ($j = $i; $j < $nTags; $j++) - { - $tag = $self->{'LOOKUP'}[$j]; - $nSub = $self->num_sub($tag); - $fh->print(pack("nnn", $ext, $tag->{'FLAG'}, $nSub)); - $fh->print(pack("n*", map {$_ * 8 + 6 + $nSub * 2} (0 .. $nSub-1))); # BH 2004-03-04 - $tag->{' EXT_OFFSET'} = $fh->tell(); # = first extension lookup subtable - $tag->{' OFFSET'} = $tag->{' EXT_OFFSET'} - $nSub * 2 - 6 - $base - $oLook; # offset to this extension lookup - for ($k = 0; $k < $nSub; $k++) - { $fh->print(pack('nnN', 1, $tag->{'TYPE'}, 0)); } - } - - $tag = $self->{'LOOKUP'}[$i]; - # Leave file positioned after all the extension lookups -- where the referenced lookups will start. - } - $tag->{' OFFSET'} = $off unless defined $big; # BH 2004-03-04 - $nSub = $self->num_sub($tag); - if (!defined $big) - { - $fh->print(pack("nnn", $tag->{'TYPE'}, $tag->{'FLAG'}, $nSub)); - $fh->print(pack("n", 0) x $nSub); - } - else - { $end = $tag->{' EXT_OFFSET'}; } - my (@offs, $out, @refs); - for ($j = 0; $j < $nSub; $j++) - { - my ($ctables) = {}; - my ($base) = length($out); - push(@offs, tell($fh) - $end + $base); - $out .= $self->out_sub($fh, $tag, $j, $ctables, $base); - push (@refs, [$ctables, $base]); - } - out_final($fh, $out, \@refs); - $end = $fh->tell(); - if (!defined $big) - { - $fh->seek($tag->{' OFFSET'} + $base + $oLook + 6, 0); - $fh->print(pack("n*", @offs)); - } - else - { - $fh->seek($tag->{' EXT_OFFSET'}, 0); - for ($j = 0; $j < $nSub; $j++) - { $fh->print(pack('nnN', 1, $tag->{'TYPE'}, $offs[$j] - $j * 8)); } - } - } - $fh->seek($oLook + $base + 2, 0); - $fh->print(pack("n*", map {$self->{'LOOKUP'}[$_]{' OFFSET'}} (0 .. $nTags - 1))); - $fh->seek($base + 6, 0); - $fh->print(pack('n2', $oFeat, $oLook)); - $fh->seek($end, 0); - $self; -} - - -=head2 $t->num_sub($lookup) - -Asks the subclass to count the number of subtables for a particular lookup and to -return that value. Used in out(). - -=cut - -sub num_sub -{ - my ($self, $lookup) = @_; - - return $#{$lookup->{'SUB'}} + 1; -} - - -=head2 $t->out_sub($fh, $lookup, $index) - -This stub is to allow subclasses to output subtables of lookups in a table specific manner. A -reference to the lookup is passed in along with the subtable index. The file is located at the -start of the subtable to be output - -=cut - -sub out_sub -{ } - -=head2 $t->dirty - -Setting GPOS or GSUB dirty means that OS/2 may need updating, so set it dirty. - -=cut - -sub dirty -{ - my ($self, $val) = @_; - my $res = $self->SUPER::dirty ($val); - $self->{' PARENT'}{'OS/2'}->read->dirty($val) if exists $self->{' PARENT'}{'OS/2'}; - $res; -} - -=head2 $t->maxContext - -Returns the length of the longest opentype rule in this table. - -=cut - -sub maxContext -{ - my ($self) = @_; - - # Make sure table is read - $self->read; - - # Calculate my contribution to OS/2 usMaxContext - - my ($maxcontext, $l, $s, $r, $m); - - for $l (@{$self->{'LOOKUP'}}) # Examine each lookup - { - for $s (@{$l->{'SUB'}}) # Multiple possible subtables for this lookup - { - for $r (@{$s->{'RULES'}}) # One ruleset for each covered glyph - { - for $m (@{$r}) # Multiple possible matches for this covered glyph - { - my $lgt; - $lgt++ if exists $s->{'COVERAGE'}; # Count 1 for the coverage table if it exists - for (qw(MATCH PRE POST)) - { - $lgt += @{$m->{$_}} if exists $m->{$_}; - } - $maxcontext = $lgt if $lgt > $maxcontext; - } - } - - } - } - - $maxcontext; -} - - -=head2 $t->update - -Unless $t->{' PARENT'}{' noharmony'} is true, update will make sure that GPOS and GSUB include -the same scripts and languages. Any added scripts and languages will have empty feature sets. - -=cut - -# Assumes we are called on both GSUB and GPOS. So simply ADDS scripts and languages to $self that it finds -# in the other table. - -sub update -{ - my ($self) = @_; - - return undef unless ($self->SUPER::update); - - # Enforce script/lang congruence unless asked not to: - return $self if $self->{' PARENT'}{' noharmony'}; - - # Find my sibling (GSUB or GPOS, depending on which I am) - my $sibling = ref($self) eq 'Font::TTF::GSUB' ? 'GPOS' : ref($self) eq 'Font::TTF::GPOS' ? 'GSUB' : undef; - return $self unless $sibling && exists $self->{' PARENT'}{$sibling}; - $sibling = $self->{' PARENT'}{$sibling}; - next unless defined $sibling; - - # Look through scripts defined in sibling: - for my $sTag (grep {length($_) == 4} keys %{$sibling->{'SCRIPTS'}}) - { - my $sibScript = $sibling->{'SCRIPTS'}{$sTag}; - $sibScript = $sibling->{$sibScript->{' REFTAG'}} if exists $sibScript->{' REFTAG'} && $sibScript->{' REFTAG'} ne ''; - - $self->{'SCRIPTS'}{$sTag} = {} unless defined $self->{'SCRIPTS'}{$sTag}; # Create script if not present in $self - - my $myScript = $self->{'SCRIPTS'}{$sTag}; - $myScript = $self->{$myScript->{' REFTAG'}} if exists $myScript->{' REFTAG'} && $myScript->{' REFTAG'} ne ''; - - foreach my $lTag (@{$sibScript->{'LANG_TAGS'}}) - { - # Ok, found a script/lang that is in our sibling. - next if exists $myScript->{$lTag}; # Already in $self - - # Need to create this lang: - push @{$myScript->{'LANG_TAGS'}}, $lTag; - $myScript->{$lTag} = { 'FEATURES' => [] }; - } - unless (defined $myScript->{'DEFAULT'}) - { - # Create default lang for this script. Link to 'dflt' if it exists - $myScript->{'DEFAULT'} = exists $myScript->{'dflt'} ? {' REFTAG' => 'dflt'} : { 'FEATURES' => [] }; - } - } - $self; -} - -=head1 Internal Functions & Methods - -Most of these methods are used by subclasses for handling such things as coverage -tables. - -=head2 copy($ref) - -Internal function to copy the top level of a dictionary to create a new dictionary. -Only the top level is copied. - -=cut - -sub copy -{ - my ($ref) = @_; - my ($res) = {}; - - foreach (keys %$ref) - { $res->{$_} = $ref->{$_}; } - $res; -} - - -=head2 $t->read_cover($cover_offset, $lookup_loc, $lookup, $fh, $is_cover) - -Reads a coverage table and stores the results in $lookup->{' CACHE'}, that is, if -it hasn't been read already. - -=cut - -sub read_cover -{ - my ($self, $offset, $base, $lookup, $fh, $is_cover) = @_; - my ($loc) = $fh->tell(); - my ($cover, $str); - - return undef unless $offset; - $str = sprintf("%X", $base + $offset); - return $lookup->{' CACHE'}{$str} if defined $lookup->{' CACHE'}{$str}; - $fh->seek($base + $offset, 0); - $cover = Font::TTF::Coverage->new($is_cover)->read($fh); - $fh->seek($loc, 0); - $lookup->{' CACHE'}{$str} = $cover; - return $cover; -} - - -=head2 ref_cache($obj, $cache, $offset) - -Internal function to keep track of the local positioning of subobjects such as -coverage and class definition tables, and their offsets. -What happens is that the cache is a hash of -sub objects indexed by the reference (using a string mashing of the -reference name which is valid for the duration of the reference) and holds a -list of locations in the output string which should be filled in with the -offset to the sub object when the final string is output in out_final. - -Uses tricks for Tie::Refhash - -=cut - -sub ref_cache -{ - my ($obj, $cache, $offset) = @_; - - return 0 unless defined $obj; - unless (defined $cache->{"$obj"}) - { push (@{$cache->{''}}, $obj); } - push (@{$cache->{"$obj"}}, $offset); - return 0; -} - - -=head2 out_final($fh, $out, $cache_list, $state) - -Internal function to actually output everything to the file handle given that -now we know the offset to the first sub object to be output and which sub objects -are to be output and what locations need to be updated, we can now -generate everything. $cache_list is an array of two element arrays. The first element -is a cache object, the second is an offset to be subtracted from each reference -to that object made in the cache. - -If $state is 1, then the output is not sent to the filehandle and the return value -is the string to be output. If $state is absent or 0 then output is not limited -by storing in a string first and the return value is ""; - -=cut - -sub out_final -{ - my ($fh, $out, $cache_list, $state) = @_; - my ($len) = length($out || ''); - my ($base_loc) = $state ? 0 : $fh->tell(); - my ($loc, $t, $r, $s, $master_cache, $offs, $str, %vecs); - - $fh->print($out || '') unless $state; # first output the current attempt - foreach $r (@$cache_list) - { - $offs = $r->[1]; - foreach $t (@{$r->[0]{''}}) - { - $str = "$t"; - if (!defined $master_cache->{$str}) - { - my ($vec) = $t->signature(); - if ($vecs{$vec}) - { $master_cache->{$str} = $master_cache->{$vecs{$vec}}; } - else - { - $vecs{$vec} = $str; - $master_cache->{$str} = ($state ? length($out) : $fh->tell()) - - $base_loc; - if ($state) - { $out .= $t->out($fh, 1); } - else - { $t->out($fh, 0); } - } - } - foreach $s (@{$r->[0]{$str}}) - { substr($out, $s, 2) = pack('n', $master_cache->{$str} - $offs); } - } - } - if ($state) - { return $out; } - else - { - $loc = $fh->tell(); - $fh->seek($base_loc, 0); - $fh->print($out || ''); # the corrected version - $fh->seek($loc, 0); - } -} - - -=head2 $self->read_context($lookup, $fh, $type, $fmt, $cover, $count, $loc) - -Internal method to read context (simple and chaining context) lookup subtables for -the GSUB and GPOS table types. The assumed values for $type correspond to those -for GSUB, so GPOS should adjust the values upon calling. - -=cut - -sub read_context -{ - my ($self, $lookup, $fh, $type, $fmt, $cover, $count, $loc) = @_; - my ($dat, $i, $s, $t, @subst, @srec, $mcount, $scount); - - if ($type == 5 && $fmt < 3) - { - if ($fmt == 2) - { - $fh->read($dat, 2); - $lookup->{'CLASS'} = $self->read_cover($count, $loc, $lookup, $fh, 0); - $count = TTF_Unpack('S', $dat); - } - $fh->read($dat, $count << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { - if ($s == 0) - { - push (@{$lookup->{'RULES'}}, []); - next; - } - @subst = (); - $fh->seek($loc + $s, 0); - $fh->read($dat, 2); - $t = TTF_Unpack('S', $dat); - $fh->read($dat, $t << 1); - foreach $t (TTF_Unpack('S*', $dat)) - { - $fh->seek($loc + $s + $t, 0); - @srec = (); - $fh->read($dat, 4); - ($mcount, $scount) = TTF_Unpack('S2', $dat); - $mcount--; - $fh->read($dat, ($mcount << 1) + ($scount << 2)); - for ($i = 0; $i < $scount; $i++) - { push (@srec, [TTF_Unpack('S2', substr($dat, - ($mcount << 1) + ($i << 2), 4))]); } - push (@subst, {'ACTION' => [@srec], - 'MATCH' => [TTF_Unpack('S*', - substr($dat, 0, $mcount << 1))]}); - } - push (@{$lookup->{'RULES'}}, [@subst]); - } - $lookup->{'ACTION_TYPE'} = 'l'; - $lookup->{'MATCH_TYPE'} = ($fmt == 2 ? 'c' : 'g'); - } elsif ($type == 5 && $fmt == 3) - { - $fh->read($dat, ($cover << 1) + ($count << 2)); - @subst = (); @srec = (); - for ($i = 0; $i < $cover; $i++) - { push (@subst, $self->read_cover(TTF_Unpack('S', substr($dat, $i << 1, 2)), - $loc, $lookup, $fh, 1)); } - for ($i = 0; $i < $count; $i++) - { push (@srec, [TTF_Unpack('S2', substr($dat, ($count << 1) + ($i << 2), 4))]); } - $lookup->{'RULES'} = [[{'ACTION' => [@srec], 'MATCH' => [@subst]}]]; - $lookup->{'ACTION_TYPE'} = 'l'; - $lookup->{'MATCH_TYPE'} = 'o'; - } elsif ($type == 6 && $fmt < 3) - { - if ($fmt == 2) - { - $fh->read($dat, 6); - $lookup->{'PRE_CLASS'} = $self->read_cover($count, $loc, $lookup, $fh, 0) if $count; - ($i, $mcount, $count) = TTF_Unpack('S3', $dat); # messy: 2 classes & count - $lookup->{'CLASS'} = $self->read_cover($i, $loc, $lookup, $fh, 0) if $i; - $lookup->{'POST_CLASS'} = $self->read_cover($mcount, $loc, $lookup, $fh, 0) if $mcount; - } - $fh->read($dat, $count << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { - if ($s == 0) - { - push (@{$lookup->{'RULES'}}, []); - next; - } - @subst = (); - $fh->seek($loc + $s, 0); - $fh->read($dat, 2); - $t = TTF_Unpack('S', $dat); - $fh->read($dat, $t << 1); - foreach $i (TTF_Unpack('S*', $dat)) - { - $fh->seek($loc + $s + $i, 0); - @srec = (); - $t = {}; - $fh->read($dat, 2); - $mcount = TTF_Unpack('S', $dat); - if ($mcount > 0) - { - $fh->read($dat, $mcount << 1); - $t->{'PRE'} = [TTF_Unpack('S*', $dat)]; - } - $fh->read($dat, 2); - $mcount = TTF_Unpack('S', $dat); - if ($mcount > 1) - { - $fh->read($dat, ($mcount - 1) << 1); - $t->{'MATCH'} = [TTF_Unpack('S*', $dat)]; - } - $fh->read($dat, 2); - $mcount = TTF_Unpack('S', $dat); - if ($mcount > 0) - { - $fh->read($dat, $mcount << 1); - $t->{'POST'} = [TTF_Unpack('S*', $dat)]; - } - $fh->read($dat, 2); - $scount = TTF_Unpack('S', $dat); - $fh->read($dat, $scount << 2); - for ($i = 0; $i < $scount; $i++) - { push (@srec, [TTF_Unpack('S2', substr($dat, $i << 2))]); } - $t->{'ACTION'} = [@srec]; - push (@subst, $t); - } - push (@{$lookup->{'RULES'}}, [@subst]); - } - $lookup->{'ACTION_TYPE'} = 'l'; - $lookup->{'MATCH_TYPE'} = ($fmt == 2 ? 'c' : 'g'); - } elsif ($type == 6 && $fmt == 3) - { - $t = {}; - unless ($cover == 0) - { - @subst = (); - $fh->read($dat, $cover << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { push(@subst, $self->read_cover($s, $loc, $lookup, $fh, 1)); } - $t->{'PRE'} = [@subst]; - } - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - unless ($count == 0) - { - @subst = (); - $fh->read($dat, $count << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { push(@subst, $self->read_cover($s, $loc, $lookup, $fh, 1)); } - $t->{'MATCH'} = [@subst]; - } - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - unless ($count == 0) - { - @subst = (); - $fh->read($dat, $count << 1); - foreach $s (TTF_Unpack('S*', $dat)) - { push(@subst, $self->read_cover($s, $loc, $lookup, $fh, 1)); } - $t->{'POST'} = [@subst]; - } - $fh->read($dat, 2); - $count = TTF_Unpack('S', $dat); - @subst = (); - $fh->read($dat, $count << 2); - for ($i = 0; $i < $count; $i++) - { push (@subst, [TTF_Unpack('S2', substr($dat, $i << 2, 4))]); } - $t->{'ACTION'} = [@subst]; - $lookup->{'RULES'} = [[$t]]; - $lookup->{'ACTION_TYPE'} = 'l'; - $lookup->{'MATCH_TYPE'} = 'o'; - } - $lookup; -} - - -=head2 $self->out_context($lookup, $fh, $type, $fmt, $ctables, $out, $num) - -Provides shared behaviour between GSUB and GPOS tables during output for context -(chained and simple) rules. In addition, support is provided here for type 4 GSUB -tables, which are not used in GPOS. The value for $type corresponds to the type -in a GSUB table so calling from GPOS should adjust the value accordingly. - -=cut - -sub out_context -{ - my ($self, $lookup, $fh, $type, $fmt, $ctables, $out, $num, $base) = @_; - my ($offc, $offd, $i, $j, $r, $t, $numd); - - $out ||= ''; - if (($type == 4 || $type == 5 || $type == 6) && ($fmt == 1 || $fmt == 2)) - { - my ($base_off); - - if ($fmt == 1) - { - $out = pack("nnn", $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - $num); - $base_off = 6; - } elsif ($type == 5) - { - $out = pack("nnnn", $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'CLASS'}, $ctables, 4 + $base), $num); - $base_off = 8; - } elsif ($type == 6) - { - $out = pack("n6", $fmt, Font::TTF::Ttopen::ref_cache($lookup->{'COVERAGE'}, $ctables, 2 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'PRE_CLASS'}, $ctables, 4 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'CLASS'}, $ctables, 6 + $base), - Font::TTF::Ttopen::ref_cache($lookup->{'POST_CLASS'}, $ctables, 8 + $base), - $num); - $base_off = 12; - } - - $out .= pack('n*', (0) x $num); - $offc = length($out); - for ($i = 0; $i < $num; $i++) - { - $r = $lookup->{'RULES'}[$i]; - next unless exists $r->[0]{'ACTION'}; - $numd = $#{$r} + 1; - substr($out, ($i << 1) + $base_off, 2) = pack('n', $offc); - $out .= pack('n*', $numd, (0) x $numd); - $offd = length($out) - $offc; - for ($j = 0; $j < $numd; $j++) - { - substr($out, $offc + 2 + ($j << 1), 2) = pack('n', $offd); - if ($type == 4) - { - $out .= pack('n*', $r->[$j]{'ACTION'}[0], $#{$r->[$j]{'MATCH'}} + 2, - @{$r->[$j]{'MATCH'}}); - } elsif ($type == 5) - { - $out .= pack('n*', $#{$r->[$j]{'MATCH'}} + 2, - $#{$r->[$j]{'ACTION'}} + 1, - @{$r->[$j]{'MATCH'}}); - foreach $t (@{$r->[$j]{'ACTION'}}) - { $out .= pack('n2', @$t); } - } elsif ($type == 6) - { - $out .= pack('n*', $#{$r->[$j]{'PRE'}} + 1, @{$r->[$j]{'PRE'}}, - $#{$r->[$j]{'MATCH'}} + 2, @{$r->[$j]{'MATCH'}}, - $#{$r->[$j]{'POST'}} + 1, @{$r->[$j]{'POST'}}, - $#{$r->[$j]{'ACTION'}} + 1); - foreach $t (@{$r->[$j]{'ACTION'}}) - { $out .= pack('n2', @$t); } - } - $offd = length($out) - $offc; - } - $offc = length($out); - } - } elsif ($type == 5 && $fmt == 3) - { - $out .= pack('n3', $fmt, $#{$lookup->{'RULES'}[0][0]{'MATCH'}} + 1, - $#{$lookup->{'RULES'}[0][0]{'ACTION'}} + 1); - foreach $t (@{$lookup->{'RULES'}[0][0]{'MATCH'}}) - { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out) + $base)); } - foreach $t (@{$lookup->{'RULES'}[0][0]{'ACTION'}}) - { $out .= pack('n2', @$t); } - } elsif ($type == 6 && $fmt == 3) - { - $r = $lookup->{'RULES'}[0][0]; - no strict 'refs'; # temp fix - more code needed (probably "if" statements in the event 'PRE' or 'POST' are empty) - $out .= pack('n2', $fmt, defined $r->{'PRE'} ? scalar @{$r->{'PRE'}} : 0); - foreach $t (@{$r->{'PRE'}}) - { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out) + $base)); } - $out .= pack('n', defined $r->{'MATCH'} ? scalar @{$r->{'MATCH'}} : 0); - foreach $t (@{$r->{'MATCH'}}) - { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out) + $base)); } - $out .= pack('n', defined $r->{'POST'} ? scalar @{$r->{'POST'}} : 0); - foreach $t (@{$r->{'POST'}}) - { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out) + $base)); } - $out .= pack('n', defined $r->{'ACTION'} ? scalar @{$r->{'ACTION'}} : 0); - foreach $t (@{$r->{'ACTION'}}) - { $out .= pack('n2', @$t); } - } - $out; -} - -=head1 BUGS - -=over 4 - -=item * - -No way to share cachable items (coverage tables, classes, anchors, device tables) -across different lookups. The items are always output after the lookup and -repeated if necessary. Within lookup sharing is possible. - -=back - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - -1; - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Useall.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Useall.pm deleted file mode 100644 index 85e69dc..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Useall.pm +++ /dev/null @@ -1,54 +0,0 @@ -use Font::TTF::Sill; -use Font::TTF::Cvt_; -use Font::TTF::Fpgm; -use Font::TTF::Glyf; -use Font::TTF::Hdmx; -use Font::TTF::Kern; -use Font::TTF::Loca; -use Font::TTF::LTSH; -use Font::TTF::Name; -use Font::TTF::OS_2; -use Font::TTF::PCLT; -use Font::TTF::Post; -use Font::TTF::Prep; -use Font::TTF::Vmtx; -use Font::TTF::AATKern; -use Font::TTF::AATutils; -use Font::TTF::Anchor; -use Font::TTF::Bsln; -use Font::TTF::Delta; -use Font::TTF::Fdsc; -use Font::TTF::Feat; -use Font::TTF::GrFeat; -use Font::TTF::Fmtx; -use Font::TTF::GPOS; -use Font::TTF::Mort; -use Font::TTF::Prop; -use Font::TTF::GDEF; -use Font::TTF::Coverage; -use Font::TTF::GSUB; -use Font::TTF::Hhea; -use Font::TTF::Table; -use Font::TTF::Ttopen; -use Font::TTF::Glyph; -use Font::TTF::Head; -use Font::TTF::Hmtx; -use Font::TTF::Vhea; -use Font::TTF::Cmap; -use Font::TTF::Utils; -use Font::TTF::Maxp; -use Font::TTF::Font; -use Font::TTF::Kern::ClassArray; -use Font::TTF::Kern::CompactClassArray; -use Font::TTF::Kern::OrderedList; -use Font::TTF::Kern::StateTable; -use Font::TTF::Kern::Subtable; -use Font::TTF::Mort::Chain; -use Font::TTF::Mort::Contextual; -use Font::TTF::Mort::Insertion; -use Font::TTF::Mort::Ligature; -use Font::TTF::Mort::Noncontextual; -use Font::TTF::Mort::Rearrangement; -use Font::TTF::Mort::Subtable; - -1; diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Utils.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Utils.pm deleted file mode 100644 index a849ee3..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Utils.pm +++ /dev/null @@ -1,630 +0,0 @@ -package Font::TTF::Utils; - -=head1 NAME - -Font::TTF::Utils - Utility functions to save fingers - -=head1 DESCRIPTION - -Lots of useful functions to save my fingers, especially for trivial tables - -=head1 FUNCTIONS - -The following functions are exported - -=cut - -use strict; -use vars qw(@ISA @EXPORT $VERSION @EXPORT_OK); -require Exporter; - -@ISA = qw(Exporter); -@EXPORT = qw(TTF_Init_Fields TTF_Read_Fields TTF_Out_Fields TTF_Pack - TTF_Unpack TTF_word_utf8 TTF_utf8_word TTF_bininfo); -@EXPORT_OK = (@EXPORT, qw(XML_hexdump)); -$VERSION = 0.0001; - -=head2 ($val, $pos) = TTF_Init_Fields ($str, $pos) - -Given a field description from the C section, creates an absolute entry -in the fields associative array for the class - -=cut - -sub TTF_Init_Fields -{ - my ($str, $pos, $inval) = @_; - my ($key, $val, $res, $len, $rel); - - $str =~ s/\r?\n$//o; - if ($inval) - { ($key, $val) = ($str, $inval); } - else - { ($key, $val) = split(',\s*', $str); } - return (undef, undef, 0) unless (defined $key && $key ne ""); - if ($val =~ m/^(\+?)(\d*)(\D+)(\d*)/oi) - { - $rel = $1; - if ($rel eq "+") - { $pos += $2; } - elsif ($2 ne "") - { $pos = $2; } - $val = $3; - $len = $4; - } - $len = "" unless defined $len; - $pos = 0 if !defined $pos || $pos eq ""; - $res = "$pos:$val:$len"; - if ($val eq "f" || $val eq 'v' || $val =~ m/^[l]/oi) - { $pos += 4 * ($len ne "" ? $len : 1); } - elsif ($val eq "F" || $val =~ m/^[s]/oi) - { $pos += 2 * ($len ne "" ? $len : 1); } - else - { $pos += 1 * ($len ne "" ? $len : 1); } - - ($key, $res, $pos); -} - - -=head2 TTF_Read_Fields($obj, $dat, $fields) - -Given a block of data large enough to account for all the fields in a table, -processes the data block to convert to the values in the objects instance -variables by name based on the list in the C block which has been run -through C - -=cut - -sub TTF_Read_Fields -{ - my ($self, $dat, $fields) = @_; - my ($pos, $type, $res, $f, $arrlen, $arr, $frac); - - foreach $f (keys %{$fields}) - { - ($pos, $type, $arrlen) = split(':', $fields->{$f}); - $pos = 0 if $pos eq ""; - if ($arrlen ne "") - { $self->{$f} = [TTF_Unpack("$type$arrlen", substr($dat, $pos))]; } - else - { $self->{$f} = TTF_Unpack("$type", substr($dat, $pos)); } - } - $self; -} - - -=head2 TTF_Unpack($fmt, $dat) - -A TrueType types equivalent of Perls C function. Thus $fmt consists of -type followed by an optional number of elements to read including *. The type -may be one of: - - c BYTE - C CHAR - f FIXED - F F2DOT14 - l LONG - L ULONG - s SHORT - S USHORT - v Version number (FIXED) - -Note that C, C and C are not data types but units. - -Returns array of scalar (first element) depending on context - -=cut - -sub TTF_Unpack -{ - my ($fmt, $dat) = @_; - my ($res, $frac, $i, $arrlen, $type, @res); - - while ($fmt =~ s/^([cflsv])(\d+|\*)?//oi) - { - $type = $1; - $arrlen = $2; - $arrlen = 1 if !defined $arrlen || $arrlen eq ""; - $arrlen = -1 if $arrlen eq "*"; - - for ($i = 0; ($arrlen == -1 && $dat ne "") || $i < $arrlen; $i++) - { - if ($type eq "f") - { - ($res, $frac) = unpack("nn", $dat); - substr($dat, 0, 4) = ""; - $res -= 65536 if $res > 32767; - $res += $frac / 65536.; - } - elsif ($type eq "v") - { - ($res, $frac) = unpack("nn", $dat); - substr($dat, 0, 4) = ""; - $res -= 65536 if $res > 32767; - $res = sprintf("%d.%X", $res, $frac); - } - elsif ($type eq "F") - { - $res = unpack("n", $dat); - substr($dat, 0, 2) = ""; -# $res -= 65536 if $res >= 32768; - $frac = $res & 0x3fff; - $res >>= 14; - $res -= 4 if $res > 1; -# $frac -= 16384 if $frac > 8191; - $res += $frac / 16384.; - } - elsif ($type =~ m/^[l]/oi) - { - $res = unpack("N", $dat); - substr($dat, 0, 4) = ""; - $res -= (1 << 32) if ($type eq "l" && $res >= 1 << 31); - } - elsif ($type =~ m/^[s]/oi) - { - $res = unpack("n", $dat); - substr($dat, 0, 2) = ""; - $res -= 65536 if ($type eq "s" && $res >= 32768); - } - elsif ($type eq "c") - { - $res = unpack("c", $dat); - substr($dat, 0, 1) = ""; - } - else - { - $res = unpack("C", $dat); - substr($dat, 0, 1) = ""; - } - push (@res, $res); - } - } - return wantarray ? @res : $res[0]; -} - - -=head2 $dat = TTF_Out_Fields($obj, $fields, $len) - -Given the fields table from C writes out the instance variables from -the object to the filehandle in TTF binary form. - -=cut - -sub TTF_Out_Fields -{ - my ($obj, $fields, $len) = @_; - my ($dat) = "\000" x $len; - my ($f, $pos, $type, $res, $arr, $arrlen, $frac); - - foreach $f (keys %{$fields}) - { - ($pos, $type, $arrlen) = split(':', $fields->{$f}); - if ($arrlen ne "") - { $res = TTF_Pack("$type$arrlen", @{$obj->{$f}}); } - else - { $res = TTF_Pack("$type", $obj->{$f}); } - substr($dat, $pos, length($res)) = $res; - } - $dat; -} - - -=head2 $dat = TTF_Pack($fmt, @data) - -The TrueType equivalent to Perl's C function. See details of C -for how to work the $fmt string. - -=cut - -sub TTF_Pack -{ - my ($fmt, @obj) = @_; - my ($type, $i, $arrlen, $dat, $res, $frac); - - $dat = ''; - while ($fmt =~ s/^([flscv])(\d+|\*)?//oi) - { - $type = $1; - $arrlen = $2 || ""; - $arrlen = $#obj + 1 if $arrlen eq "*"; - $arrlen = 1 if $arrlen eq ""; - - for ($i = 0; $i < $arrlen; $i++) - { - $res = shift(@obj) || 0; - if ($type eq "f") - { - $frac = int(($res - int($res)) * 65536); - $res = (int($res) << 16) + $frac; - $dat .= pack("N", $res); - } - elsif ($type eq "v") - { - if ($res =~ s/\.(\d+)$//o) - { - $frac = $1; - $frac .= "0" x (4 - length($frac)); - } - else - { $frac = 0; } - $dat .= pack('nn', $res, eval("0x$frac")); - } - elsif ($type eq "F") - { - $frac = int(($res - int($res)) * 16384); - $res = (int($res) << 14) + $frac; - $dat .= pack("n", $res); - } - elsif ($type =~ m/^[l]/oi) - { - $res += 1 << 32 if ($type eq 'L' && $res < 0); - $dat .= pack("N", $res); - } - elsif ($type =~ m/^[s]/oi) - { - $res += 1 << 16 if ($type eq 'S' && $res < 0); - $dat .= pack("n", $res); - } - elsif ($type eq "c") - { $dat .= pack("c", $res); } - else - { $dat .= pack("C", $res); } - } - } - $dat; -} - - -=head2 ($num, $range, $select, $shift) = TTF_bininfo($num) - -Calculates binary search information from a number of elements - -=cut - -sub TTF_bininfo -{ - my ($num, $block) = @_; - my ($range, $select, $shift); - - $range = 1; - for ($select = 0; $range <= $num; $select++) - { $range *= 2; } - $select--; $range /= 2; - $range *= $block; - - $shift = $num * $block - $range; - ($num, $range, $select, $shift); -} - - -=head2 TTF_word_utf8($str) - -Returns the UTF8 form of the 16 bit string, assumed to be in big endian order, -including surrogate handling - -=cut - -sub TTF_word_utf8 -{ - my ($str) = @_; - my ($res, $i); - my (@dat) = unpack("n*", $str); - - return pack("U*", @dat) if ($] >= 5.006); - for ($i = 0; $i <= $#dat; $i++) - { - my ($dat) = $dat[$i]; - if ($dat < 0x80) # Thanks to Gisle Aas for some of his old code - { $res .= chr($dat); } - elsif ($dat < 0x800) - { $res .= chr(0xC0 | ($dat >> 6)) . chr(0x80 | ($dat & 0x3F)); } - elsif ($dat >= 0xD800 && $dat < 0xDC00) - { - my ($dat1) = $dat[++$i]; - my ($top) = (($dat & 0x3C0) >> 6) + 1; - $res .= chr(0xF0 | ($top >> 2)) - . chr(0x80 | (($top & 1) << 4) | (($dat & 0x3C) >> 2)) - . chr(0x80 | (($dat & 0x3) << 4) | (($dat1 & 0x3C0) >> 6)) - . chr(0x80 | ($dat1 & 0x3F)); - } else - { $res .= chr(0xE0 | ($dat >> 12)) . chr(0x80 | (($dat >> 6) & 0x3F)) - . chr(0x80 | ($dat & 0x3F)); } - } - $res; -} - - -=head2 TTF_utf8_word($str) - -Returns the 16-bit form in big endian order of the UTF 8 string, including -surrogate handling to Unicode. - -=cut - -sub TTF_utf8_word -{ - my ($str) = @_; - my ($res); - - return pack("n*", unpack("U*", $str)) if ($^V ge v5.6.0); - $str = "$str"; # copy $str - while (length($str)) # Thanks to Gisle Aas for some of his old code - { - $str =~ s/^[\x80-\xBF]+//o; - if ($str =~ s/^([\x00-\x7F]+)//o) - { $res .= pack("n*", unpack("C*", $1)); } - elsif ($str =~ s/^([\xC0-\xDF])([\x80-\xBF])//o) - { $res .= pack("n", ((ord($1) & 0x1F) << 6) | (ord($2) & 0x3F)); } - elsif ($str =~ s/^([\0xE0-\xEF])([\x80-\xBF])([\x80-\xBF])//o) - { $res .= pack("n", ((ord($1) & 0x0F) << 12) - | ((ord($2) & 0x3F) << 6) - | (ord($3) & 0x3F)); } - elsif ($str =~ s/^([\xF0-\xF7])([\x80-\xBF])([\x80-\xBF])([\x80-\xBF])//o) - { - my ($b1, $b2, $b3, $b4) = (ord($1), ord($2), ord($3), ord($4)); - $res .= pack("n", ((($b1 & 0x07) << 8) | (($b2 & 0x3F) << 2) - | (($b3 & 0x30) >> 4)) + 0xD600); # account for offset - $res .= pack("n", ((($b3 & 0x0F) << 6) | ($b4 & 0x3F)) + 0xDC00); - } - elsif ($str =~ s/^[\xF8-\xFF][\x80-\xBF]*//o) - { } - } - $res; -} - - -=head2 XML_hexdump($context, $dat) - -Dumps out the given data as a sequence of blocks each 16 bytes wide - -=cut - -sub XML_hexdump -{ - my ($context, $depth, $dat) = @_; - my ($fh) = $context->{'fh'}; - my ($i, $len, $out); - - $len = length($dat); - for ($i = 0; $i < $len; $i += 16) - { - $out = join(' ', map {sprintf("%02X", ord($_))} (split('', substr($dat, $i, 16)))); - $fh->printf("%s%s\n", $depth, $i, $out); - } -} - - -=head2 XML_outhints - -Converts a binary string of hinting code into a textual representation - -=cut - -{ - my (@hints) = ( - ['SVTCA[0]'], ['SVTCA[1]'], ['SPVTCA[0]'], ['SPVTCA[1]'], ['SFVTCA[0]'], ['SFVTCA[1]'], ['SPVTL[0]'], ['SPVTL[1]'], - ['SFVTL[0]'], ['SFVTL[1]'], ['SPVFS'], ['SFVFS'], ['GPV'], ['GFV'], ['SVFTPV'], ['ISECT'], -# 10 - ['SRP0'], ['SRP1'], ['SRP2'], ['SZP0'], ['SZP1'], ['SZP2'], ['SZPS'], ['SLOOP'], - ['RTG'], ['RTHG'], ['SMD'], ['ELSE'], ['JMPR'], ['SCVTCI'], ['SSWCI'], ['SSW'], -# 20 - ['DUP'], ['POP'], ['CLEAR'], ['SWAP'], ['DEPTH'], ['CINDEX'], ['MINDEX'], ['ALIGNPTS'], - [], ['UTP'], ['LOOPCALL'], ['CALL'], ['FDEF'], ['ENDF'], ['MDAP[0]'], ['MDAP[1]'], -# 30 - ['IUP[0]'], ['IUP[1]'], ['SHP[0]'], ['SHP[1]'], ['SHC[0]'], ['SHC[1]'], ['SHZ[0]'], ['SHZ[1]'], - ['SHPIX'], ['IP'], ['MSIRP[0]'], ['MSIRP[1]'], ['ALIGNRP'], ['RTDG'], ['MIAP[0]'], ['MIAP[1]'], -# 40 - ['NPUSHB', -1, 1], ['NPUSHW', -1, 2], ['WS', 0, 0], ['RS', 0, 0], ['WCVTP', 0, 0], ['RCVT', 0, 0], ['GC[0]'], ['GC[1]'], - ['SCFS'], ['MD[0]'], ['MD[1]'], ['MPPEM'], ['MPS'], ['FLIPON'], ['FLIPOFF'], ['DEBUG'], -# 50 - ['LT'], ['LTEQ'], ['GT'], ['GTEQ'], ['EQ'], ['NEQ'], ['ODD'], ['EVEN'], - ['IF'], ['EIF'], ['AND'], ['OR'], ['NOT'], ['DELTAP1'], ['SDB'], ['SDS'], -# 60 - ['ADD'], ['SUB'], ['DIV'], ['MULT'], ['ABS'], ['NEG'], ['FLOOR'], ['CEILING'], - ['ROUND[0]'], ['ROUND[1]'], ['ROUND[2]'], ['ROUND[3]'], ['NROUND[0]'], ['NROUND[1]'], ['NROUND[2]'], ['NROUND[3]'], -# 70 - ['WCVTF'], ['DELTAP2'], ['DELTAP3'], ['DELTAC1'], ['DELTAC2'], ['DELTAC3'], ['SROUND'], ['S45ROUND'], - ['JROT'], ['JROF'], ['ROFF'], [], ['RUTG'], ['RDTG'], ['SANGW'], [], -# 80 - ['FLIPPT'], ['FLIPRGON'], ['FLIPRGOFF'], [], [], ['SCANCTRL'], ['SDPVTL[0]'], ['SDPVTL[1]'], - ['GETINFO'], ['IDEF'], ['ROLL'], ['MAX'], ['MIN'], ['SCANTYPE'], ['INSTCTRL'], [], -# 90 - [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], -# A0 - [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], -# B0 - ['PUSHB1', 1, 1], ['PUSHB2', 2, 1], ['PUSHB3', 3, 1], ['PUSHB4', 4, 1], ['PUSHB5', 5, 1], ['PUSHB6', 6, 1], ['PUSHB7', 7, 1], ['PUSHB8', 8, 1], - ['PUSHW1', 1, 2], ['PUSHW2', 2, 2], ['PUSHW3', 3, 2], ['PUSHW4', 4, 2], ['PUSHW5', 5, 2], ['PUSHW6', 6, 2], ['PUSHW7', 7, 2], ['PUSHW8', 8, 2], -# C0 - ['MDRP[0]'], ['MDRP[1]'], ['MDRP[2]'], ['MDRP[3]'], ['MDRP[4]'], ['MDRP[5]'], ['MDRP[6]'], ['MDRP[7]'], - ['MDRP[8]'], ['MDRP[9]'], ['MDRP[A]'], ['MDRP[B]'], ['MDRP[C]'], ['MDRP[D]'], ['MDRP[E]'], ['MDRP[F]'], -# D0 - ['MDRP[10]'], ['MDRP[11]'], ['MDRP[12]'], ['MDRP[13]'], ['MDRP[14]'], ['MDRP[15]'], ['MDRP[16]'], ['MDRP[17]'], - ['MDRP[18]'], ['MDRP[19]'], ['MDRP[1A]'], ['MDRP[1B]'], ['MDRP[1C]'], ['MDRP[1D]'], ['MDRP[1E]'], ['MDRP[1F]'], -# E0 - ['MIRP[0]'], ['MIRP[1]'], ['MIRP[2]'], ['MIRP[3]'], ['MIRP[4]'], ['MIRP[5]'], ['MIRP[6]'], ['MIRP[7]'], - ['MIRP[8]'], ['MIRP[9]'], ['MIRP[A]'], ['MIRP[B]'], ['MIRP[C]'], ['MIRP[D]'], ['MIRP[E]'], ['MIRP[F]'], -# F0 - ['MIRP[10]'], ['MIRP[11]'], ['MIRP[12]'], ['MIRP[13]'], ['MIRP[14]'], ['MIRP[15]'], ['MIRP[16]'], ['MIRP[17]'], - ['MIRP[18]'], ['MIRP[19]'], ['MIRP[1A]'], ['MIRP[1B]'], ['MIRP[1C]'], ['MIRP[1D]'], ['MIRP[1E]'], ['MIRP[1F]']); - - my ($i); - my (%hints) = map { $_->[0] => $i++ if (defined $_->[0]); } @hints; - - sub XML_binhint - { - my ($dat) = @_; - my ($len) = length($dat); - my ($res, $i, $text, $size, $num); - - for ($i = 0; $i < $len; $i++) - { - ($text, $num, $size) = @{$hints[ord(substr($dat, $i, 1))]}; - $num = 0 unless (defined $num); - $text = sprintf("UNK[%02X]", ord(substr($dat, $i, 1))) unless defined $text; - $res .= $text; - if ($num != 0) - { - if ($num < 0) - { - $i++; - my ($nnum) = unpack($num == -1 ? 'C' : 'n', substr($dat, $i, -$num)); - $i += -$num - 1; - $num = $nnum; - } - $res .= "\t" . join(' ', unpack($size == 1 ? 'C*' : 'n*', substr($dat, $i + 1, $num * $size))); - $i += $num * $size; - } - $res .= "\n"; - } - $res; - } - - sub XML_hintbin - { - my ($dat) = @_; - my ($l, $res, @words, $num); - - foreach $l (split(/\s*\n\s*/, $dat)) - { - @words = split(/\s*/, $l); - next unless (defined $hints{$words[0]}); - $num = $hints{$words[0]}; - $res .= pack('C', $num); - if ($hints[$num][1] < 0) - { - $res .= pack($hints[$num][1] == -1 ? 'C' : 'n', $#words); - $res .= pack($hints[$num][2] == 1 ? 'C*' : 'n*', @words[1 .. $#words]); - } - elsif ($hints[$num][1] > 0) - { - $res .= pack($hints[$num][2] == 1 ? 'C*' : 'n*', @words[1 .. $hints[$num][1]]); - } - } - $res; - } -} - - -=head2 make_circle($f, $cmap, [$dia, $sb, $opts]) - -Adds a dotted circle to a font. This function is very configurable. The -parameters passed in are: - -=over 4 - -=item $f - -Font to work with. This is required. - -=item $cmap - -A cmap table (not the 'val' sub-element of a cmap) to add the glyph too. Optional. - -=item $dia - -Optional diameter for the main circle. Defaults to 80% em - -=item $sb - -Side bearing. The left and right side-bearings are always the same. This value -defaults to 10% em. - -=back - -There are various options to control all sorts of interesting aspects of the circle - -=over 4 - -=item numDots - -Number of dots in the circle - -=item numPoints - -Number of curve points to use to create each dot - -=item uid - -Unicode reference to store this glyph under in the cmap. Defaults to 0x25CC - -=item pname - -Postscript name to give the glyph. Defaults to uni25CC. - -=item -dRadius - -Radius of each dot. - -=back - -=cut - -sub make_circle -{ - my ($font, $cmap, $dia, $sb, %opts) = @_; - my ($upem) = $font->{'head'}{'unitsPerEm'}; - my ($glyph) = Font::TTF::Glyph->new('PARENT' => $font, 'read' => 2); - my ($PI) = 3.1415926535; - my ($R, $r, $xorg, $yorg); - my ($i, $j, $numg, $maxp); - my ($numc) = $opts{'-numDots'} || 16; - my ($nump) = ($opts{'-numPoints'} * 2) || 8; - my ($uid) = $opts{'-uid'} || 0x25CC; - my ($pname) = $opts{'-pname'} || 'uni25CC'; - - $dia ||= $upem * .8; # .95 to fit exactly - $sb ||= $upem * .1; - $R = $dia / 2; - $r = $opts{'-dRadius'} || ($R * .1); - ($xorg, $yorg) = ($R + $r, $R); - - $xorg += $sb; - $font->{'post'}->read; - $font->{'glyf'}->read; - for ($i = 0; $i < $numc; $i++) - { - my ($pxorg, $pyorg) = ($xorg + $R * cos(2 * $PI * $i / $numc), - $yorg + $R * sin(2 * $PI * $i / $numc)); - for ($j = 0; $j < $nump; $j++) - { - push (@{$glyph->{'x'}}, int ($pxorg + ($j & 1 ? 1/cos(2*$PI/$nump) : 1) * $r * cos(2 * $PI * $j / $nump))); - push (@{$glyph->{'y'}}, int ($pyorg + ($j & 1 ? 1/cos(2*$PI/$nump) : 1) * $r * sin(2 * $PI * $j / $nump))); - push (@{$glyph->{'flags'}}, $j & 1 ? 0 : 1); - } - push (@{$glyph->{'endPoints'}}, $#{$glyph->{'x'}}); - } - $glyph->{'numberOfContours'} = $#{$glyph->{'endPoints'}} + 1; - $glyph->{'numPoints'} = $#{$glyph->{'x'}} + 1; - $glyph->update; - $numg = $font->{'maxp'}{'numGlyphs'}; - $font->{'maxp'}{'numGlyphs'}++; - - $font->{'hmtx'}{'advance'}[$numg] = int($xorg + $R + $r + $sb + .5); - $font->{'hmtx'}{'lsb'}[$numg] = int($xorg - $R - $r + .5); - $font->{'loca'}{'glyphs'}[$numg] = $glyph; - $cmap->{'val'}{$uid} = $numg if ($cmap); - $font->{'post'}{'VAL'}[$numg] = $pname; - delete $font->{'hdmx'}; - delete $font->{'VDMX'}; - delete $font->{'LTSH'}; - - $font->tables_do(sub {$_[0]->dirty;}); - $font->update; - return ($numg - 1); -} - - -1; - -=head1 BUGS - -No known bugs - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vhea.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vhea.pm deleted file mode 100644 index 2e1a49a..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vhea.pm +++ /dev/null @@ -1,159 +0,0 @@ -package Font::TTF::Vhea; - -=head1 NAME - -Font::TTF::Vhea - Vertical Header table - -=head1 DESCRIPTION - -This is a simple table with just standards specified instance variables - -=head1 INSTANCE VARIABLES - - version - Ascender - Descender - LineGap - advanceHeightMax - minTopSideBearing - minBottomSideBearing - yMaxExtent - caretSlopeRise - caretSlopeRun - metricDataFormat - numberOfVMetrics - - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA %fields @field_info); - -require Font::TTF::Table; -use Font::TTF::Utils; - -@ISA = qw(Font::TTF::Table); -@field_info = ( - 'version' => 'v', - 'Ascender' => 's', - 'Descender' => 's', - 'LineGap' => 's', - 'advanceHeightMax' => 'S', - 'minTopSideBearing' => 's', - 'minBottomSideBearing' => 's', - 'yMaxExtent' => 's', - 'caretSlopeRise' => 's', - 'caretSlopeRun' => 's', - 'metricDataFormat' => '+10s', - 'numberOfVMetrics' => 's'); - -sub init -{ - my ($k, $v, $c, $i); - for ($i = 0; $i < $#field_info; $i += 2) - { - ($k, $v, $c) = TTF_Init_Fields($field_info[$i], $c, $field_info[$i + 1]); - next unless defined $k && $k ne ""; - $fields{$k} = $v; - } -} - - -=head2 $t->read - -Reads the table into memory as instance variables - -=cut - -sub read -{ - my ($self) = @_; - my ($dat); - - $self->SUPER::read or return $self; - init unless defined $fields{'Ascender'}; - $self->{' INFILE'}->read($dat, 36); - - TTF_Read_Fields($self, $dat, \%fields); - $self; -} - - -=head2 $t->out($fh) - -Writes the table to a file either from memory or by copying. - -=cut - -sub out -{ - my ($self, $fh) = @_; - - return $self->SUPER::out($fh) unless $self->{' read'}; - - $self->{'numberOfVMetrics'} = $self->{' PARENT'}{'vmtx'}->numMetrics || $self->{'numberOfVMetrics'}; - $fh->print(TTF_Out_Fields($self, \%fields, 36)); - $self; -} - - -=head2 $t->update - -Updates various parameters in the hhea table from the hmtx table, assuming -the C table is dirty. - -=cut - -sub update -{ - my ($self) = @_; - my ($vmtx) = $self->{' PARENT'}{'vmtx'}; - my ($glyphs); - my ($num); - my ($i, $maw, $mlsb, $mrsb, $mext, $aw, $lsb, $ext); - - return undef unless ($self->SUPER::update); - return undef unless (defined $vmtx && defined $self->{' PARENT'}{'loca'}); - $vmtx->read->update; - $self->{' PARENT'}{'loca'}->read->update; - $glyphs = $self->{' PARENT'}{'loca'}{'glyphs'}; - $num = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - - for ($i = 0; $i < $num; $i++) - { - $aw = $vmtx->{'advance'}[$i]; - $lsb = $vmtx->{'top'}[$i]; - if (defined $glyphs->[$i]) - { $ext = $lsb + $glyphs->[$i]->read->{'yMax'} - $glyphs->[$i]{'yMin'}; } - else - { $ext = $aw; } - $maw = $aw if ($aw > $maw); - $mlsb = $lsb if ($lsb < $mlsb or $i == 0); - $mrsb = $aw - $ext if ($aw - $ext < $mrsb or $i == 0); - $mext = $ext if ($ext > $mext); - } - $self->{'advanceHeightMax'} = $maw; - $self->{'minTopSideBearing'} = $mlsb; - $self->{'minBottomSideBearing'} = $mrsb; - $self->{'yMaxExtent'} = $mext; - $self->{'numberOfVMetrics'} = $vmtx->numMetrics; - $self; -} - - -1; - - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vmtx.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vmtx.pm deleted file mode 100644 index b74d6df..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Vmtx.pm +++ /dev/null @@ -1,86 +0,0 @@ -package Font::TTF::Vmtx; - -=head1 NAME - -Font::TTF::Vmtx - Vertical Metrics - -=head1 DESCRIPTION - -Contains the advance height and top side bearing for each glyph. Given the -compressability of the data onto disk, this table uses information from -other tables, and thus must do part of its output during the output of -other tables - -=head1 INSTANCE VARIABLES - -The vertical metrics are kept in two arrays by glyph id. The variable names -do not start with a space - -=over 4 - -=item advance - -An array containing the advance height for each glyph - -=item top - -An array containing the top side bearing for each glyph - -=back - -=head1 METHODS - -=cut - -use strict; -use vars qw(@ISA); -require Font::TTF::Hmtx; - -@ISA = qw(Font::TTF::Hmtx); - - -=head2 $t->read - -Reads the vertical metrics from the TTF file into memory - -=cut - -sub read -{ - my ($self) = @_; - my ($numh, $numg); - - $numh = $self->{' PARENT'}{'vhea'}->read->{'numberOfVMetrics'}; - $numg = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - $self->_read($numg, $numh, "advance", "top"); -} - - -=head2 $t->out($fh) - -Writes the metrics to a TTF file. Assumes that the C has updated the -numVMetrics from here - -=cut - -sub out -{ - my ($self, $fh) = @_; - my ($numg) = $self->{' PARENT'}{'maxp'}{'numGlyphs'}; - my ($numh) = $self->{' PARENT'}{'vhea'}{'numberOfVMetrics'}; - $self->_out($fh, $numg, $numh, "advance", "top"); -} - -1; - -=head1 BUGS - -None known - -=head1 AUTHOR - -Martin Hosken Martin_Hosken@sil.org. See L for copyright and -licensing. - -=cut - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Win32.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Win32.pm deleted file mode 100644 index bb8886e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/Win32.pm +++ /dev/null @@ -1,33 +0,0 @@ -package Font::TTF::Win32; - -# use strict; -# use vars qw($HKEY_LOCAL_MACHINE); - -use Win32::Registry; -use Win32; -use File::Spec; -use Font::TTF::Font; - - -sub findfonts -{ - my ($sub) = @_; - my ($font_key) = 'SOFTWARE\Microsoft\Windows' . (Win32::IsWinNT() ? ' NT' : '') . '\CurrentVersion\Fonts'; - my ($regFont, $list, $l, $font, $file); - -# get entry from registry for a font of this name - $::HKEY_LOCAL_MACHINE->Open($font_key, $regFont); - $regFont->GetValues($list); - - foreach $l (sort keys %{$list}) - { - my ($fname) = $list->{$l}[0]; - next unless ($fname =~ s/\(TrueType\)$//o); - $file = File::Spec->rel2abs($list->{$l}[2], "$ENV{'windir'}/fonts"); - $font = Font::TTF::Font->open($file) || next; - &{$sub}($font, $fname); - $font->release; - } -} - -1; diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/XMLparse.pm b/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/XMLparse.pm deleted file mode 100644 index 7b2b571..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/Font/TTF/XMLparse.pm +++ /dev/null @@ -1,176 +0,0 @@ -package Font::TTF::XMLparse; - -=head1 NAME - -Font::TTF::XMLparse - provides support for XML parsing. Requires Expat module XML::Parser::Expat - -=head1 SYNOPSIS - - use Font::TTF::Font; - use Font::TTF::XMLparse; - - $f = Font::TTF::Font->new; - read_xml($f, $ARGV[0]); - $f->out($ARGV[1]); - -=head1 DESCRIPTION - -This module contains the support routines for parsing XML and generating the -Truetype font structures as a result. The module has been separated from the rest -of the package in order to reduce the dependency that this would bring, of the -whole package on XML::Parser. This way, people without the XML::Parser can still -use the rest of the package. - -The package interacts with another package through the use of a context containing -and element 'receiver' which is an object which can possibly receive one of the -following messages: - -=over 4 - -=item XML_start - -This message is called when an open tag occurs. It is called with the context, -tag name and the attributes. The return value has no meaning. - -=item XML_end - -This messages is called when a close tag occurs. It is called with the context, -tag name and attributes (held over from when the tag was opened). There are 3 -possible return values from such a message: - -=over 8 - -=item undef - -This is the default return value indicating that default processing should -occur in which either the current element on the tree, or the text of this element -should be stored in the parent object. - -=item $context - -This magic value marks that the element should be deleted from the parent. -Nothing is stored in the parent. (This rather than '' is used to allow 0 returns.) - -=item anything - -Anything else is taken as the element content to be stored in the parent. - -=back 4 - -=back 4 - -In addition, the context hash passed to these messages contains the following -keys: - -=over 4 - -=item xml - -This is the expat xml object. The context is also available as -$context->{'xml'}{' mycontext'}. But that is a long winded way of not saying much! - -=item font - -This is the base object that was passed in for XML parsing. - -=item receiver - -This holds the current receiver of parsing events. It may be set in associated -application to adjust which objects should receive messages when. It is also stored -in the parsing stack to ensure that where an object changes it during XML_start, that -that same object that received XML_start will receive the corresponding XML_end - -=item stack - -This is the parsing stack, used internally to hold the current receiver and attributes -for each element open, as a complete hierarchy back to the root element. - -=item tree - -This element contains the storage tree corresponding to the parent of each element -in the stack. The default action is to push undef onto this stack during XML_start -and then to resolve this, either in the associated application (by changing -$context->{'tree'}[-1]) or during XML_end of a child element, by which time we know -whether we are dealing with an array or a hash or what. - -=item text - -Character processing is to insert all the characters into the text element of the -context for available use later. - -=back 4 - -=head1 METHODS - -=cut - -use XML::Parser::Expat; -require Exporter; - -use strict; -use vars qw(@ISA @EXPORT); - -@ISA = qw(Exporter); -@EXPORT = qw(read_xml); - -sub read_xml -{ - my ($font, $fname) = @_; - - my ($xml) = XML::Parser::Expat->new; - my ($context) = {'xml' => $xml, 'font' => $font}; - - $xml->setHandlers('Start' => sub { - my ($x, $tag, %attrs) = @_; - my ($context) = $x->{' mycontext'}; - my ($fn) = $context->{'receiver'}->can('XML_start'); - - push(@{$context->{'tree'}}, undef); - push(@{$context->{'stack'}}, [$context->{'receiver'}, {%attrs}]); - &{$fn}($context->{'receiver'}, $context, $tag, %attrs) if defined $fn; - }, - 'End' => sub { - my ($x, $tag) = @_; - my ($context) = $x->{' mycontext'}; - my ($fn) = $context->{'receiver'}->can('XML_end'); - my ($stackinfo) = pop(@{$context->{'stack'}}); - my ($current, $res); - - $context->{'receiver'} = $stackinfo->[0]; - $context->{'text'} =~ s/^\s*(.*?)\s*$/$1/o; - $res = &{$fn}($context->{'receiver'}, $context, $tag, %{$stackinfo->[1]}) if defined $fn; - $current = pop(@{$context->{'tree'}}); - $current = $context->{'text'} unless (defined $current); - $context->{'text'} = ''; - - if (defined $res) - { - return if ($res eq $context); - $current = $res; - } - return unless $#{$context->{'tree'}} >= 0; - if ($tag eq 'elem') - { - $context->{'tree'}[-1] = [] unless defined $context->{'tree'}[-1]; - push (@{$context->{'tree'}[-1]}, $current); - } else - { - $context->{'tree'}[-1] = {} unless defined $context->{'tree'}[-1]; - $context->{'tree'}[-1]{$tag} = $current; - } - }, - 'Char' => sub { - my ($x, $str) = @_; - $x->{' mycontext'}{'text'} .= $str; - }); - - $xml->{' mycontext'} = $context; - - $context->{'receiver'} = $font; - if (ref $fname) - { return $xml->parse($fname); } - else - { return $xml->parsefile($fname); } -} - - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/lib/ttfmod.pl b/src/librarian/font-optimizer/ext/Font-TTF/lib/ttfmod.pl deleted file mode 100644 index dd10f9e..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/lib/ttfmod.pl +++ /dev/null @@ -1,174 +0,0 @@ -# Title: TTFMOD.PL -# Author: M. Hosken -# Description: Read TTF file calling user functions for each table -# and output transformed tables to new TTF file. -# Useage: TTFMOD provides the complete control loop for processing -# the TTF files. All that the caller need supply is an -# associative array of functions to call keyed by the TTF -# table name and the two filenames. -# -# &ttfmod($infile, $outfile, *fns [, @must]); -# -# *fns is an associative array keyed by table name with -# values of the name of the subroutine in package main to -# be called to transfer the table from INFILE to OUTFILE. -# The subroutine is called with the following parameters and -# expected return values: -# -# ($len, $csum) = &sub(*INFILE, *OUTFILE, $len); -# -# INFILE and OUTFILE are the input and output streams, $len -# is the length of the table according to the directory. -# The return values are $len = new length of table to be -# given in the table directory. $csum = new value of table -# checksum. A way to test that this is correct is to -# checksum the whole file (e.g. using CSUM.BAT) and to -# ensure that the value is 0xB1B0AFBA according to a 32 bit -# checksum calculated bigendien. -# -# @must consists of a list of tables which must exist in the -# final output file, either by being there alread or by being -# inserted. -# -# Modifications: -# MJPH 1.00 22-SEP-1994 Original -# MJPH 1.1 18-MAR-1998 Added @must to ttfmod() -# MJPH 1.1.1 25-MAR-1998 Added $csum to copytab (to make reusable) - -package ttfmod; - -sub main'ttfmod { - local($infile, $outfile, *fns, @must) = @_; - - # open files as binary. Notice OUTFILE is opened for update not just write - open(INFILE, "$infile") || die "Unable top open \"$infile\" for reading"; - binmode INFILE; - open(OUTFILE, "+>$outfile") || die "Unable to open \"$outfile\" for writing"; - binmode OUTFILE; - - seek(INFILE, 0, 0); - read(INFILE, $dir_head, 12) || die "Reading table header"; - ($dir_num) = unpack("x4n", $dir_head); - print OUTFILE $dir_head; - # read and unpack table directory - for ($i = 0; $i < $dir_num; $i++) - { - read(INFILE, $dir_val, 16) || die "Reading table entry"; - $dir{unpack("a4", $dir_val)} = join(":", $i, unpack("x4NNN", $dir_val)); - print OUTFILE $dir_val; - printf STDERR "%s %08x\n", unpack("a4", $dir_val), unpack("x8N", $dir_val) - if (defined $main'opt_z); - } - foreach $n (@must) - { - next if defined $dir{$n}; - $dir{$n} = "$i:0:-1:0"; - $i++; $dir_num++; - print OUTFILE pack("a4NNN", $n, 0, -1, 0); - } - substr($dir_head, 4, 2) = pack("n", $dir_num); - $csum = unpack("%32N*", $dir_head); - $off = tell(OUTFILE); - seek(OUTFILE, 0, 0); - print OUTFILE $dir_head; - seek (OUTFILE, $off, 0); - # process tables in order they occur in the file - @dirlist = sort byoffset keys(%dir); - foreach $tab (@dirlist) - { - @tab_split = split(':', $dir{$tab}); - seek(INFILE, $tab_split[2], 0); # offset - $tab_split[2] = tell(OUTFILE); - if (defined $fns{$tab}) - { - $temp = "main'$fns{$tab}"; - ($dir_len, $sum) = &$temp(*INFILE, *OUTFILE, $tab_split[3]); - } - else - { - ($dir_len, $sum) = ©tab(*INFILE, *OUTFILE, $tab_split[3]); - } - $tab_split[3] = $dir_len; # len - $tab_split[1] = $sum; # checksum - $out_dir{$tab} = join(":", @tab_split); - } - # now output directory in same order as original directory - @dirlist = sort byindex keys(%out_dir); - foreach $tab (@dirlist) - { - @tab_split = split(':', $out_dir{$tab}); - seek (OUTFILE, 12 + $tab_split[0] * 16, 0); # directory index - print OUTFILE pack("A4N3", $tab, @tab_split[1..3]); - foreach $i (1..3, 1) # checksum directory values with csum twice - { - $csum += $tab_split[$i]; - # this line ensures $csum stays within 32 bit bounds, clipping as necessary - if ($csum > 0xffffffff) { $csum -= 0xffffffff; $csum--; } - } - # checksum the tag - $csum += unpack("N", $tab); - if ($csum > 0xffffffff) { $csum -= 0xffffffff; $csum--; } - } - # handle main checksum - @tab_split = split(':', $out_dir{"head"}); - seek(OUTFILE, $tab_split[2], 0); - read(OUTFILE, $head_head, 12); # read first bit of "head" table - @head_split = unpack("N3", $head_head); - $tab_split[1] -= $head_split[2]; # subtract old checksum - $csum -= $head_split[2] * 2; # twice because had double effect - # already - if ($csum < 0 ) { $csum += 0xffffffff; $csum++; } - $head_split[2] = 0xB1B0AFBA - $csum; # calculate new checksum - seek (OUTFILE, 12 + $tab_split[0] * 16, 0); - print OUTFILE pack("A4N3", "head", @tab_split[1..3]); - seek (OUTFILE, $tab_split[2], 0); # rewrite first bit of "head" table - print OUTFILE pack("N3", @head_split); - - # finish up - close(OUTFILE); - close(INFILE); - } - -# support function for sorting by table offset -sub byoffset { - @t1 = split(':', $dir{$a}); - @t2 = split(':', $dir{$b}); - return 1 if ($t1[2] == -1); # put inserted tables at the end - return -1 if ($t2[2] == -1); - return $t1[2] <=> $t2[2]; - } - -# support function for sorting by directory entry order -sub byindex { - $t1 = split(':', $dir{$a}, 1); - $t2 = split(':', $dir{$b}, 1); - return $t1 <=> $t2; - } - -# default table action: copies a table from input to output, recalculating -# the checksum (just to be absolutely sure). -sub copytab { - local(*INFILE, *OUTFILE, $len, $csum) = @_; - - while ($len > 0) - { - $count = ($len > 8192) ? 8192 : $len; # 8K buffering - read(INFILE, $buf, $count) == $count || die "Copying"; - $buf .= "\0" x (4 - ($count & 3)) if ($count & 3); # pad to long - print OUTFILE $buf; - $csum += unpack("%32N*", $buf); - if ($csum > 0xffffffff) { $csum -= 0xffffffff; $csum--; } - $len -= $count; - } - ($_[2], $csum); - } - -# test routine to copy file from input to output, no changes -package main; - -if ($test_package) - { - &ttfmod($ARGV[0], $ARGV[1], *dummy); - } -else - { 1; } diff --git a/src/librarian/font-optimizer/ext/Font-TTF/t/OFL.txt b/src/librarian/font-optimizer/ext/Font-TTF/t/OFL.txt deleted file mode 100644 index 0b4fe4b..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/t/OFL.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright (c) 2005-2007, M. Hosken and SIL International, -with Reserved Font Name FontUtils Test - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/librarian/font-optimizer/ext/Font-TTF/t/tags.t b/src/librarian/font-optimizer/ext/Font-TTF/t/tags.t deleted file mode 100644 index f50e521..0000000 --- a/src/librarian/font-optimizer/ext/Font-TTF/t/tags.t +++ /dev/null @@ -1,11 +0,0 @@ -use strict; - -use Test::Simple tests => 3; -use Font::TTF::OTTags qw( %tttags %ttnames readtagsfile); - -ok($tttags{'SCRIPT'}{'Cypriot Syllabary'} eq 'cprt', 'tttags{SCRIPT}'); - -ok($ttnames{'LANGUAGE'}{'AFK '} eq 'Afrikaans', 'ttnames{LANGUAGE}'); - -ok($ttnames{'LANGUAGE'}{'DHV '} eq 'Dhivehi (OBSOLETE)' && $ttnames{'LANGUAGE'}{'DIV '} eq 'Dhivehi', 'ttnames{LANGUAGE} Dhivehi'); - diff --git a/src/librarian/font-optimizer/ext/Font-TTF/t/testfont.ttf b/src/librarian/font-optimizer/ext/Font-TTF/t/testfont.ttf deleted file mode 100644 index d1bc3cf32adfea6c4f31de0c450b302f1a3fd477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35624 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 2; -use File::Compare; -use Font::TTF::Font; - -$f = Font::TTF::Font->open("t/testfont.ttf"); -ok($f); -$f->tables_do(sub { $_[0]->read; }); -$f->{'loca'}->glyphs_do(sub {$_[0]->read_dat; }); -$f->out("t/temp.ttf"); -$res = compare("t/temp.ttf", "t/testfont.ttf"); -ok(!$res); -unlink "t/temp.ttf" unless ($res); - diff --git a/src/librarian/font-optimizer/gen-tests.pl b/src/librarian/font-optimizer/gen-tests.pl deleted file mode 100644 index 63bb153..0000000 --- a/src/librarian/font-optimizer/gen-tests.pl +++ /dev/null @@ -1,235 +0,0 @@ -# This script generates various 'interesting' fonts, and outputs an HTML file -# containing the subsetted fonts and the original fonts. -# View the output in browsers (preferably multiple, on multiple platforms) to -# make sure the output looks the same as the original. - -use strict; -use warnings; - -use lib 'ext/Font-TTF/lib'; -use Font::Subsetter; -use Font::EOTWrapper; -use Encode; -use Clone; - -use utf8; - -# The following fonts need to exist in a directory called 'testfonts': -my @all = qw( - GenBasR.ttf - GenR102.TTF - LinLibertine_Re-4.1.8.ttf - DoulosSILR.ttf - DejaVuSans.ttf - DejaVuSerif.ttf - calibri.ttf - FedraSansPro-Demi.ttf -); - -my $index = $ARGV[0]; -die "Run '$0', or '$0 n' where n is the number of the test to rebuild\n" - if defined $index and $index !~ /^\d+$/; - -my @tests = ( - # These aren't proper tests (they drop features that affect the rendering) - # TODO: fix them so they are proper, and test that they're really dropping the - # unneeded glyphs etc -# [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf)], ["fluffily لا f"], [20], [qw(aalt ccmp dlig fina hlig init liga locl medi rlig salt kern mark mkmk)] ], -# [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf)], ["fluffily لا f"], [20], [qw(liga)] ], -# [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf)], ["fluffily لا f"], [20], [qw(fina init rlig)] ], -# [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf)], ["fluffily لا f"], [20], [] ], - - # Basic rendering - [ [@all], ["Hello world ABC abc 123"], [20] ], - - # Substitution and NFC issues - [ [qw(GenBasR.ttf DejaVuSans.ttf FedraSansPro-Demi.ttf)], [ - "i", - "\xec", - "i\x{0300}", - "i \x{0300}", - "ixixi", - "i\x{0300}", - ], [20, 8] ], - [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf)], [ - "s\x{0323}\x{0307}", # s, combining dot below, combining dot above - "s\x{0307}\x{0323}", # s, combining dot above, combining dot below - "\x{1e61}\x{0323}", # s with dot above, combining dot below - "\x{1e63}\x{0307}", # s with dot below, combining dot above - "\x{212b}", # angstrom - ], [20, 8] ], - - # Ligature rendering - [ [qw(LinLibertine_Re-4.1.8.ttf DejaVuSans.ttf FedraSansPro-Demi.ttf)], [ - "fluffily", - "fluffily", - "fluffily", - ], [20, 8] ], - - # GPOS issues - [ [qw(DejaVuSans.ttf FedraSansPro-Demi.ttf calibri.ttf)], - ["|VAVAV|", "ToToT", "x//x"], [20], ['kern'] ], - - # Lots of stuff - [ [@all], ["VABC(123) fTo fluffiest ffi!\@#,. \x{00e2}\x{00eb}I\x{0303}o\x{0300}u\x{030a}\x{0305}\x{0303} i\x{0331}\x{0301} \x{0d23}\x{0d4d}\x{200d} παρακαλώ хэлло 你好 表示问候 やあ التلفون הלו"], [20, 8] ], - -); - -my $common_css = <preload($fn); - $font_cache{$fn} = $s; - } - return Clone::clone($font_cache{$fn}); -} - -my %std_fonts; -# if (0) { my $j = 0; -for my $j (0..$#all) { - my $fn = $all[$j]; - (my $eot_fn = $fn) =~ s/\.[ot]tf$/.eot/i; - if (not -e "testfonts/$eot_fn") { - Font::EOTWrapper::convert("testfonts/$fn", "testfonts/$eot_fn"); - } - $common_css .= <', 'testoutput/tests.html' or die $!; - binmode $out, ':utf8'; - - print $out < - -Font tests - -EOF -} - -my $i = -1; -for my $test (@tests) { - for my $fn (@{$test->[0]}) { - for my $text (@{$test->[1]}) { - ++$i; - next if defined $index and $index != $i; - - print encode('utf-8', "$fn -- $text\n"); - - (my $text_plain = $text) =~ s/<.*?>//g; - - my $features; - if ($test->[3]) { - $features = { DEFAULT => 0 }; - $features->{$_} = 1 for @{$test->[3]}; - } - - my $s = new_font("testfonts/$fn"); - $s->subset("testfonts/$fn", $text_plain, { features => $features }); - my $path = sprintf '%03d', $i; - $s->write("testoutput/$path.ttf"); - my $old_glyphs = $s->num_glyphs_old; - my $new_glyphs = $s->num_glyphs_new; - my @glyph_names = $s->glyph_names; - $s->release; - - Font::EOTWrapper::convert("testoutput/$path.ttf", "testoutput/$path.eot"); - - my $fragment = < -\@font-face { /* for IE */ - font-family: subsetted-$i; - src: url($path.eot); -} -\@font-face { - font-family: subsetted-$i; - src: url($path.ttf) format("truetype"); -} - -EOF - - for my $size (@{$test->[2]}) { - $fragment .= <$text -
    -$text

    -EOF - } - - print $out qq{\n\n$fragment#} if not defined $index; - - open my $html, '>', "testoutput/$path.html"; - binmode $html, ':utf8'; - print $html < - -Font test $path - -$fragment -EOF - print $html qq{

    }, (join '   ', map "$_", sort @glyph_names), qq{

    }; - print $html qq{
    }, dump_sizes("testoutput/$path.ttf"), qq{
    }; - } - print $out "
    \n" if not defined $index; - } -} - -sub dump_sizes { - my ($fn) = @_; - my $font = Font::TTF::Font->open($fn) or die "Failed to open $fn: $!"; - - my $s = 0; - my $out = ''; - for (sort keys %$font) { - next if /^ /; - my $l = $font->{$_}{' LENGTH'}; - $s += $l; - $out .= "$_: $l\n"; - } - $out .= "Total: $s\n"; - return $out; -} diff --git a/src/librarian/font-optimizer/list-features.pl b/src/librarian/font-optimizer/list-features.pl deleted file mode 100755 index 3264a48..0000000 --- a/src/librarian/font-optimizer/list-features.pl +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use lib 'ext/Font-TTF/lib'; -use Font::TTF::Font; - -use Getopt::Long; - -main(); - -sub help { - print <open($input_file) or die "Error opening $input_file: $!"; - - my %feats; - my @feats; - for my $table (grep defined, $font->{GPOS}, $font->{GSUB}) { - $table->read; - for my $feature (@{$table->{FEATURES}{FEAT_TAGS}}) { - $feature =~ /^(\w{4})( _\d+)?$/ or die "Unrecognised feature tag syntax '$feature'"; - my $tag = $1; - next if $feats{$tag}++; - push @feats, $tag; - } - } - print map "$_\n", @feats; - - $font->release; -} diff --git a/src/librarian/font-optimizer/modify-names.pl b/src/librarian/font-optimizer/modify-names.pl deleted file mode 100755 index 3198bee..0000000 --- a/src/librarian/font-optimizer/modify-names.pl +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/perl -CA - # use the -CA flag so @ARGV is interpreted as UTF-8 - -use strict; -use warnings; - -binmode STDOUT, ':utf8'; - -use lib 'ext/Font-TTF/lib'; -use Font::TTF::Font; - -my @name_strings = qw( - copyright - family - subfamily - unique-identifier - full-name - version - postscript - trademark - manufacturer - designer - description - vendor-url - designer-url - license - license-url - RESERVED - preferred-family - preferred-subfamily - compatible-full - sample-text - postscript-cid - wws-family - wws-subfamily -); -my %name_strings; -$name_strings{$name_strings[$_]} = $_ for 0..$#name_strings; - -main(); - -sub help { - print <{name}{strings}[$id]; - my $exists = 0; - for my $plat (0..$#$str) { - next unless $str->[$plat]; - for my $enc (0..$#{$str->[$plat]}) { - next unless $str->[$plat][$enc]; - for my $lang (keys %{$str->[$plat][$enc]}) { - next unless exists $str->[$plat][$enc]{$lang}; - my $val = $sub->($str->[$plat][$enc]{$lang}, $plat, $enc, $lang); - $str->[$plat][$enc]{$lang} = $val; - $exists = 1 - } - } - } - if (not $exists) { - warn "Can't find existing name string '$name_strings[$id]' ($id)\n"; - } -} - - -sub json_string { - my ($str) = @_; - $str =~ s/([\\"])/\\$1/g; - $str =~ s/\r/\\r/g; - $str =~ s/\n/\\n/g; - $str =~ s/\t/\\t/g; - $str =~ s/([\x00-\x1f])/sprintf '\u%04X', ord $1/eg; - return qq{"$str"}; -} - -sub print_names { - my ($font) = @_; - my @lines; - for my $nid (0..$#name_strings) { - my $name = $font->{name}->find_name($nid); - if (length $name) { - push @lines, json_string($name_strings[$nid]).': '.json_string($name); - } - } - - print "{\n"; - print join ",\n\n", @lines; - print "\n}\n"; -} - -sub parse_id { - my ($name) = @_; - if ($name =~ /^\d+$/ and $name < @name_strings) { - return int $name; - } - my $id = $name_strings{lc $name}; - return $id if defined $id; - warn "Invalid name string identifier '$name'\n\n"; - help(); -} - -sub main { - my $verbose = 0; - my $print = 0; - my @commands; - - my @args = @ARGV; - my @rest; - while (@args) { - $_ = shift @args; - if ($_ eq '-v' or $_ eq '--verbose') { - $verbose = 1; - } elsif ($_ eq '-p' or $_ eq '--print') { - $print = 1; - push @commands, [ 'print' ]; - } elsif ($_ eq '--set') { - @args >= 2 or help(); - my $id = parse_id(shift @args); - my $val = shift @args; - push @commands, [ 'set', $id, $val ]; - } elsif ($_ eq '--append') { - @args >= 2 or help(); - my $id = parse_id(shift @args); - my $val = shift @args; - push @commands, [ 'append', $id, $val ]; - } elsif ($_ eq '--subst') { - @args >= 3 or help(); - my $id = parse_id(shift @args); - my $val1 = shift @args; - my $val2 = shift @args; - push @commands, [ 'subst', $id, $val1, $val2 ]; - } else { - push @rest, $_; - } - } - - ($print and (@rest == 1 or @rest == 2)) or @rest == 2 or help(); - - my ($input_file, $output_file) = @rest; - - my $font = Font::TTF::Font->open($input_file) or die "Error opening $input_file: $!"; - - $font->{name}->read; - - for my $cmd (@commands) { - if ($cmd->[0] eq 'print') { - print_names($font); - } elsif ($cmd->[0] eq 'set') { - my $id = $cmd->[1]; - modify_name($font, $id, sub { - my ($val, $plat, $enc, $lang) = @_; - print "Setting string $id (platform=$plat encoding=$enc lang=$lang)\n" if $verbose; - return $cmd->[2]; - }); - } elsif ($cmd->[0] eq 'append') { - my $id = $cmd->[1]; - modify_name($font, $id, sub { - my ($val, $plat, $enc, $lang) = @_; - print "Appending to string $id (platform=$plat encoding=$enc lang=$lang)\n" if $verbose; - return $val . $cmd->[2]; - }); - } elsif ($cmd->[0] eq 'subst') { - my $id = $cmd->[1]; - modify_name($font, $id, sub { - my ($val, $plat, $enc, $lang) = @_; - my $pat = quotemeta($cmd->[2]); - my $n = ($val =~ s/$pat/$cmd->[3]/g) || 0; - print "Substituting string $id (platform=$plat encoding=$enc lang=$lang) - $n match(es)\n" if $verbose; - warn "No match found for substitution on string '$name_strings[$id]'\n" if not $n; - return $val; - }); - } else { - die; - } - } - - $font->out($output_file) if $output_file; - - $font->release; -} diff --git a/src/librarian/font-optimizer/obfuscate-font.pl b/src/librarian/font-optimizer/obfuscate-font.pl deleted file mode 100755 index 0850426..0000000 --- a/src/librarian/font-optimizer/obfuscate-font.pl +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use lib 'ext/Font-TTF/lib'; -use Font::TTF::Font; - -use Getopt::Long; - -main(); - -sub help { - print <{name}{strings}[$id]; - for my $plat (0..$#$str) { - next unless $str->[$plat]; - for my $enc (0..$#{$str->[$plat]}) { - next unless $str->[$plat][$enc]; - for my $lang (keys %{$str->[$plat][$enc]}) { - next unless exists $str->[$plat][$enc]{$lang}; - if ($verbose) { - print "Setting string $_ (plat $plat, enc $enc) to \"$val\"\n"; - } - $str->[$plat][$enc]{$lang} = $val; - } - } - } -} - -sub strip_names { - my ($font, $verbose) = @_; - - print "Stripping names\n" if $verbose; - - $font->{name}->read; - - for (16, 17, 18) { - if ($verbose and $font->{name}{strings}[$_]) { - print "Deleting string $_\n"; - } - $font->{name}{strings}[$_] = undef; - } - - for (1, 3, 5) { - set_name($font, $_, '', $verbose); - } - - for (4, 6) { - set_name($font, $_, '-', $verbose); - } -} - -sub strip_post { - my ($font, $verbose) = @_; - - print "Stripping post table\n" if $verbose; - - # Replace it with the minimum necessary to work in browsers - # (particularly Opera is a bit fussy) - my $data = pack NNnnNNNNN => 0x10000, 0, 0, 0, 0, 0, 0, 0, 0; - $font->{post} = new Font::TTF::Table(dat => $data); -} - -sub main { - my $verbose = 0; - my $all; - my $names; - my $post; - - my $result = GetOptions( - 'verbose' => \$verbose, - 'all' => \$all, - 'names' => \$names, - 'post' => \$post, - ) or help(); - - @ARGV == 2 or help(); - - if (not ($all or $names or $post)) { help(); } - - my ($input_file, $output_file) = @ARGV; - - my $font = Font::TTF::Font->open($input_file) or die "Error opening $input_file: $!"; - - strip_names($font, $verbose) if $all or $names; - strip_post($font, $verbose) if $all or $post; - - $font->out($output_file); - - $font->release; -} diff --git a/src/librarian/font-optimizer/subset.pl b/src/librarian/font-optimizer/subset.pl deleted file mode 100755 index 642fe3d..0000000 --- a/src/librarian/font-optimizer/subset.pl +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/perl - -# -CA flag is forbidden in #! line -use Encode qw(decode); - @ARGV = map { decode 'utf-8', $_ } @ARGV; - -use strict; -use warnings; - -use lib 'ext/Font-TTF/lib'; -use Font::Subsetter; - -use Getopt::Long; - -main(); - -sub help { - print < \$chars, - 'charsfile=s' => \$charsfile, - 'verbose' => \$verbose, - 'include=s' => \$include, - 'exclude=s' => \$exclude, - 'apply=s' => \$apply, - 'licensesubst=s' => \$license_desc_subst, - ) or help(); - - if (defined $chars and defined $charsfile) { - print "ERROR: Only one of '--chars' and --charsfile' can be specified\n\n"; - help(); - } elsif (defined $chars) { - # just use $chars - } elsif (defined $charsfile) { - open my $f, '<', $charsfile or die "Failed to open $charsfile: $!"; - binmode $f, ':utf8'; - local $/; - $chars = <$f>; - } else { - $chars = 'test'; - } - - @ARGV == 2 or help(); - - my ($input_file, $output_file) = @ARGV; - - - if ($verbose) { - dump_sizes($input_file); - print "Generating subsetted font...\n\n"; - } - - my $features; - if ($include) { - $features = { DEFAULT => 0 }; - $features->{$_} = 1 for split /,/, $include; - } elsif ($exclude) { - $features = { DEFAULT => 1 }; - $features->{$_} = 0 for split /,/, $exclude; - } - - my $fold_features; - if ($apply) { - $fold_features = [ split /,/, $apply ]; - } - - my $subsetter = new Font::Subsetter(); - $subsetter->subset($input_file, $chars, { - features => $features, - fold_features => $fold_features, - license_desc_subst => $license_desc_subst, - }); - $subsetter->write($output_file); - - if ($verbose) { - print "\n"; - print "Features:\n "; - print join ' ', $subsetter->feature_status(); - print "\n\n"; - print "Included glyphs:\n "; - print join ' ', $subsetter->glyph_names(); - print "\n\n"; - dump_sizes($output_file); - } - - $subsetter->release(); -} - -sub dump_sizes { - my ($filename) = @_; - my $font = Font::TTF::Font->open($filename) or die "Failed to open $filename: $!"; - print "TTF table sizes:\n"; - my $s = 0; - for (sort keys %$font) { - next if /^ /; - my $l = $font->{$_}{' LENGTH'}; - $s += $l; - print " $_: $l\n"; - } - print "Total size: $s bytes\n\n"; - $font->release(); -} diff --git a/src/librarian/font-optimizer/t/subsetter.pl b/src/librarian/font-optimizer/t/subsetter.pl deleted file mode 100644 index 5cb15df..0000000 --- a/src/librarian/font-optimizer/t/subsetter.pl +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use Test::More qw(no_plan); - -use lib 'ext/Font-TTF/lib'; -use Font::Subsetter; -use Unicode::Normalize; - -# Test that we include characters needed for strings converted to NFC -for my $str ( - "i", - "\xec", - "i\x{0300}", - "\x{0300}i", - "\x{03b9}\x{0308}\x{0301}", # iota, combining diaeresis, combining acute - "s\x{0323}\x{0307}", # s, combining dot below, combining dot above - "s\x{0307}\x{0323}", # s, combining dot above, combining dot below - "\x{1e61}\x{0323}", # s with dot above, combining dot below - "\x{1e63}\x{0307}", # s with dot below, combining dot above - "\x{212b}", # angstrom -) { - my $subsetter = new Font::Subsetter; - my %chars = $subsetter->expand_wanted_chars($str); - for (map ord, split //, $str) { - ok($chars{$_}, "char ".(sprintf '%04x', $_)." in string '".(join ' ', map { sprintf '%04x', $_ } unpack 'U*', $str)."'"); - } - for (map ord, split //, Unicode::Normalize::NFC($str)) { - ok($chars{$_}, "NFC char ".(sprintf '%04x', $_)." in string '".(join ' ', map { sprintf '%04x', $_ } unpack 'U*', $str)."'"); - } -} - -# Test that spurious characters aren't included -for my $str ( - "a\xec", -) { - my $subsetter = new Font::Subsetter; - my %chars = $subsetter->expand_wanted_chars($str); - my %exp; - $exp{$_} = 1 for map ord, split //, $str; - $exp{$_} = 1 for map ord, split //, Unicode::Normalize::NFC($str); - for (sort keys %chars) { - ok($exp{$_}, "expected char ".(sprintf '%04x', $_)." from string '".(join ' ', map { sprintf '%04x', $_ } unpack 'U*', $str)."'"); - } -} diff --git a/src/librarian/fonts.py b/src/librarian/fonts.py index adaeae4..0f99bf4 100644 --- a/src/librarian/fonts.py +++ b/src/librarian/fonts.py @@ -1,38 +1,21 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import os from shutil import rmtree -import subprocess from tempfile import mkdtemp +from fontTools.subset import main -def strip_font(path, chars, verbose=False): +def strip_font(path, chars): tmpdir = mkdtemp('-librarian-epub') - try: - cwd = os.getcwd() - except OSError: - cwd = None - - os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), - 'font-optimizer')) - optimizer_call = [ - 'perl', 'subset.pl', '--chars', - ''.join(chars).encode('utf-8'), + main([ path, - os.path.join(tmpdir, 'font.ttf') - ] - env = {"PERL_USE_UNSAFE_INC": "1"} - if verbose: - print("Running font-optimizer") - subprocess.check_call(optimizer_call, env=env) - else: - dev_null = open(os.devnull, 'w') - subprocess.check_call(optimizer_call, stdout=dev_null, - stderr=dev_null, env=env) + '--text=' + ''.join(chars), + '--output-file=' + os.path.join(tmpdir, 'font.ttf') + ]) with open(os.path.join(tmpdir, 'font.ttf'), 'rb') as f: content = f.read() rmtree(tmpdir) - - if cwd is not None: - os.chdir(cwd) - return content diff --git a/src/librarian/functions.py b/src/librarian/functions.py index 2899808..bcaa784 100644 --- a/src/librarian/functions.py +++ b/src/librarian/functions.py @@ -1,10 +1,6 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - from lxml import etree import re from ebooklib import epub @@ -21,11 +17,11 @@ def _register_function(f): def reg_substitute_entities(): entity_substitutions = [ - (u'---', u'—'), - (u'--', u'–'), - (u'...', u'…'), - (u',,', u'„'), - (u'"', u'”'), + ('---', '—'), + ('--', '–'), + ('...', '…'), + (',,', '„'), + ('"', '”'), ] def substitute_entities(context, text): @@ -131,7 +127,7 @@ def mathml_latex(context, trees): from librarian.embeds.mathml import MathML text = MathML(trees[0]).to_latex().data # Remove invisible multiplications, they produce unwanted spaces. - text = text.replace(u'\u2062', '') + text = text.replace('\u2062', '') return text diff --git a/src/librarian/html.py b/src/librarian/html.py index 6ed5c52..c2f41c0 100644 --- a/src/librarian/html.py +++ b/src/librarian/html.py @@ -1,13 +1,12 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import print_function, unicode_literals - +import io import os import re import copy +import urllib.parse +import urllib.request from lxml import etree from librarian import XHTMLNS, ParseError, OutputFile @@ -15,7 +14,6 @@ from librarian import functions from PIL import Image from lxml.etree import XMLSyntaxError, XSLTApplyError -import six functions.reg_substitute_entities() @@ -23,8 +21,6 @@ functions.reg_person_name() STYLESHEETS = { 'legacy': 'xslt/book2html.xslt', - 'full': 'xslt/wl2html_full.xslt', - 'partial': 'xslt/wl2html_partial.xslt' } @@ -42,7 +38,7 @@ def transform_abstrakt(abstrakt_element): style_filename = get_stylesheet('legacy') style = etree.parse(style_filename) xml = etree.tostring(abstrakt_element, encoding='unicode') - document = etree.parse(six.StringIO( + document = etree.parse(io.StringIO( xml.replace('abstrakt', 'dlugi_cytat') )) # HACK result = document.xslt(style) @@ -56,9 +52,9 @@ def add_image_sizes(tree, gallery_path, gallery_url, base_url): for i, ilustr in enumerate(tree.findall('//ilustr')): rel_path = ilustr.attrib['src'] - img_url = six.moves.urllib.parse.urljoin(base_url, rel_path) + img_url = urllib.parse.urljoin(base_url, rel_path) - f = six.moves.urllib.request.urlopen(img_url) + f = urllib.request.urlopen(img_url) img = Image.open(f) ext = {'GIF': 'gif', 'PNG': 'png'}.get(img.format, 'jpg') @@ -151,8 +147,7 @@ def transform(wldoc, stylesheet='legacy', options=None, flags=None, css=None, ga raise ParseError(e) -@six.python_2_unicode_compatible -class Fragment(object): +class Fragment: def __init__(self, id, themes): super(Fragment, self).__init__() self.id = id @@ -180,7 +175,7 @@ class Fragment(object): result = [] for event, element in self.closed_events(): if event == 'start': - result.append(u'<%s %s>' % ( + result.append('<%s %s>' % ( element.tag, ' '.join( '%s="%s"' % (k, v) @@ -190,7 +185,7 @@ class Fragment(object): if element.text: result.append(element.text) elif event == 'end': - result.append(u'' % element.tag) + result.append('' % element.tag) if element.tail: result.append(element.tail) else: @@ -209,7 +204,7 @@ def extract_fragments(input_filename): # iterparse would die on a HTML document parser = etree.HTMLParser(encoding='utf-8') - buf = six.BytesIO() + buf = io.BytesIO() buf.write(etree.tostring( etree.parse(input_filename, parser).getroot()[0][0], encoding='utf-8' @@ -294,13 +289,13 @@ def add_anchor(element, prefix, with_link=True, with_target=True, link_text = prefix anchor = etree.Element('a', href='#%s' % prefix) anchor.set('class', 'anchor') - anchor.text = six.text_type(link_text) + anchor.text = str(link_text) parent.insert(index, anchor) if with_target: anchor_target = etree.Element('a', name='%s' % prefix) anchor_target.set('class', 'target') - anchor_target.text = u' ' + anchor_target.text = ' ' parent.insert(index, anchor_target) @@ -379,7 +374,7 @@ def add_table_of_contents(root): toc = etree.Element('div') toc.set('id', 'toc') toc_header = etree.SubElement(toc, 'h2') - toc_header.text = u'Spis treści' + toc_header.text = 'Spis treści' toc_list = etree.SubElement(toc, 'ol') for n, section, text, subsections in sections: diff --git a/src/librarian/hyphenator.py b/src/librarian/hyphenator.py index fdd50d4..c2fbb81 100644 --- a/src/librarian/hyphenator.py +++ b/src/librarian/hyphenator.py @@ -14,8 +14,6 @@ info@wilbertberendsen.nl License: LGPL. """ -from __future__ import print_function, unicode_literals - import sys import re diff --git a/src/librarian/meta/types/base.py b/src/librarian/meta/types/base.py index 4a10c8d..e4af0f8 100644 --- a/src/librarian/meta/types/base.py +++ b/src/librarian/meta/types/base.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# class MetaValue: has_language = True diff --git a/src/librarian/meta/types/bool.py b/src/librarian/meta/types/bool.py index 961e31f..700cca0 100644 --- a/src/librarian/meta/types/bool.py +++ b/src/librarian/meta/types/bool.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import MetaValue diff --git a/src/librarian/meta/types/person.py b/src/librarian/meta/types/person.py index 2317780..ba1b55f 100644 --- a/src/librarian/meta/types/person.py +++ b/src/librarian/meta/types/person.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from functools import total_ordering from .base import MetaValue @@ -33,7 +36,7 @@ class Person(MetaValue): return cls(surname, *names) def readable(self): - return u" ".join(self.first_names + (self.last_name,)) + return " ".join(self.first_names + (self.last_name,)) def __eq__(self, right): return (self.last_name == right.last_name diff --git a/src/librarian/meta/types/text.py b/src/librarian/meta/types/text.py index 768004a..8010ec1 100644 --- a/src/librarian/meta/types/text.py +++ b/src/librarian/meta/types/text.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# from .base import MetaValue diff --git a/src/librarian/meta/types/wluri.py b/src/librarian/meta/types/wluri.py index 422b18e..367157f 100644 --- a/src/librarian/meta/types/wluri.py +++ b/src/librarian/meta/types/wluri.py @@ -1,3 +1,6 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# import re from .base import MetaValue diff --git a/src/librarian/mobi.py b/src/librarian/mobi.py deleted file mode 100644 index d6c2515..0000000 --- a/src/librarian/mobi.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import unicode_literals - -from copy import deepcopy -import os -import subprocess -from tempfile import NamedTemporaryFile - -from librarian import OutputFile - - -def transform(wldoc, verbose=False, sample=None, cover=None, - use_kindlegen=False, flags=None, hyphenate=True, base_url='', - converter_path=None): - """ produces a MOBI file - - wldoc: a WLDocument - sample=n: generate sample e-book (with at least n paragraphs) - cover: a cover.Cover factory overriding default - flags: less-advertising, - converter_path: override path to MOBI converter, - either ebook-convert or kindlegen - """ - - document = deepcopy(wldoc) - del wldoc - - epub = document.as_epub(verbose=verbose, sample=sample, - cover=cover or True, flags=flags, - hyphenate=hyphenate, base_url=base_url, - output_type='mobi') - if verbose: - kwargs = {} - else: - devnull = open("/dev/null", 'w') - kwargs = {"stdout": devnull, "stderr": devnull} - - output_file = NamedTemporaryFile(prefix='librarian', suffix='.mobi', - delete=False) - output_file.close() - - if use_kindlegen: - output_file_basename = os.path.basename(output_file.name) - subprocess.check_call([converter_path or 'kindlegen', - '-c2', epub.get_filename(), - '-o', output_file_basename], **kwargs) - else: - subprocess.check_call([converter_path or 'ebook-convert', - epub.get_filename(), - output_file.name, '--no-inline-toc', - '--mobi-file-type=both', - '--mobi-ignore-margins'], **kwargs) - return OutputFile.from_filename(output_file.name) diff --git a/src/librarian/packagers.py b/src/librarian/packagers.py deleted file mode 100644 index 0f7a42e..0000000 --- a/src/librarian/packagers.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from __future__ import print_function, unicode_literals - -import os -from librarian import pdf, epub, mobi, DirDocProvider, ParseError -from librarian.parser import WLDocument - -from .util import makedirs - - -class Packager(object): - cover = None - flags = None - - @classmethod - def transform(cls, *args, **kwargs): - return cls.converter.transform(*args, **kwargs) - - @classmethod - def prepare_file(cls, main_input, output_dir, verbose=False, - overwrite=False): - path, fname = os.path.realpath(main_input).rsplit('/', 1) - provider = DirDocProvider(path) - slug, ext = os.path.splitext(fname) - - if output_dir != '': - makedirs(output_dir) - outfile = os.path.join(output_dir, slug + '.' + cls.ext) - if os.path.exists(outfile) and not overwrite: - return - - doc = WLDocument.from_file(main_input, provider=provider) - output_file = cls.transform(doc, cover=cls.cover, flags=cls.flags) - doc.save_output_file(output_file, output_path=outfile) - - @classmethod - def prepare(cls, input_filenames, output_dir='', verbose=False, - overwrite=False): - try: - for main_input in input_filenames: - if verbose: - print(main_input) - cls.prepare_file(main_input, output_dir, verbose, overwrite) - except ParseError as e: - print('%(file)s:%(name)s:%(message)s' % { - 'file': main_input, - 'name': e.__class__.__name__, - 'message': e.message - }) - - -class EpubPackager(Packager): - converter = epub - ext = 'epub' - - -class MobiPackager(Packager): - converter = mobi - ext = 'mobi' - - -class PdfPackager(Packager): - converter = pdf - ext = 'pdf' - - @classmethod - def transform(cls, *args, **kwargs): - return cls.converter.transform(*args, morefloats='new', **kwargs) diff --git a/src/librarian/parser.py b/src/librarian/parser.py index f4288f8..484b8f9 100644 --- a/src/librarian/parser.py +++ b/src/librarian/parser.py @@ -1,26 +1,17 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - from collections import Counter - +import io +import os +import re +from xml.parsers.expat import ExpatError +from lxml import etree +from lxml.etree import XMLSyntaxError, XSLTApplyError from librarian import ValidationError, NoDublinCore, ParseError, NoProvider from librarian import RDFNS from librarian.cover import make_cover from librarian import dcparser - -from xml.parsers.expat import ExpatError -from lxml import etree -from lxml.etree import XMLSyntaxError, XSLTApplyError - -import os -import re -import six - - from .elements import WL_ELEMENTS @@ -43,7 +34,7 @@ parser.set_element_class_lookup( -class WLDocument(object): +class WLDocument: """Legacy class, to be replaced with documents.WLDocument.""" LINE_SWAP_EXPR = re.compile(r'/\s', re.MULTILINE | re.UNICODE) provider = None @@ -136,13 +127,13 @@ class WLDocument(object): @classmethod def from_bytes(cls, xml, *args, **kwargs): - return cls.from_file(six.BytesIO(xml), *args, **kwargs) + return cls.from_file(io.BytesIO(xml), *args, **kwargs) @classmethod def from_file(cls, xmlfile, *args, **kwargs): # first, prepare for parsing - if isinstance(xmlfile, six.text_type): + if isinstance(xmlfile, str): file = open(xmlfile, 'rb') try: data = file.read() @@ -151,14 +142,14 @@ class WLDocument(object): else: data = xmlfile.read() - if not isinstance(data, six.text_type): + if not isinstance(data, str): data = data.decode('utf-8') - data = data.replace(u'\ufeff', '') + data = data.replace('\ufeff', '') try: parser = etree.XMLParser(remove_blank_text=False) - tree = etree.parse(six.BytesIO(data.encode('utf-8')), parser) + tree = etree.parse(io.BytesIO(data.encode('utf-8')), parser) return cls(tree, *args, **kwargs) except (ExpatError, XMLSyntaxError, XSLTApplyError) as e: @@ -192,9 +183,8 @@ class WLDocument(object): raise NoDublinCore('No Dublin Core in document.') for part_uri in self.book_info.parts: try: - yield self.from_file( - self.provider.by_slug(part_uri.slug), provider=self.provider - ) + with self.provider.by_slug(part_uri.slug) as f: + yield self.from_file(f, provider=self.provider) except Exception as e: if pass_part_errors: yield e @@ -298,18 +288,10 @@ class WLDocument(object): from librarian import text return text.transform(self, *args, **kwargs) - def as_epub(self, *args, **kwargs): - from librarian import epub - return epub.transform(self, *args, **kwargs) - def as_pdf(self, *args, **kwargs): from librarian import pdf return pdf.transform(self, *args, **kwargs) - def as_mobi(self, *args, **kwargs): - from librarian import mobi - return mobi.transform(self, *args, **kwargs) - def as_fb2(self, *args, **kwargs): from librarian import fb2 return fb2.transform(self, *args, **kwargs) @@ -333,7 +315,7 @@ class WLDocument(object): if make_author_dir: save_path = os.path.join( save_path, - six.text_type(self.book_info.author).encode('utf-8') + str(self.book_info.author).encode('utf-8') ) save_path = os.path.join(save_path, self.book_info.url.slug) if ext: diff --git a/src/librarian/partners.py b/src/librarian/partners.py deleted file mode 100644 index 2c0682d..0000000 --- a/src/librarian/partners.py +++ /dev/null @@ -1,140 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# - -""" -Classes for packaging ebooks for some old partners. -These should be removed from librarian to separate package, -along with custom cover images etc. - -New partners shouldn't be added here, but in the partners repository. -""" -from __future__ import print_function, unicode_literals - -from librarian import packagers, cover -from .util import makedirs - - -class GandalfEpub(packagers.EpubPackager): - cover = cover.GandalfCover - - -class GandalfPdf(packagers.PdfPackager): - cover = cover.GandalfCover - - -class BookotekaEpub(packagers.EpubPackager): - cover = cover.BookotekaCover - - -class PrestigioEpub(packagers.EpubPackager): - cover = cover.PrestigioCover - flags = ('less-advertising',) - - -class PrestigioPdf(packagers.PdfPackager): - cover = cover.PrestigioCover - flags = ('less-advertising',) - - -class Virtualo(packagers.Packager): - @staticmethod - def utf_trunc(text, limit): - """ truncates text to at most `limit' bytes in utf-8 """ - if text is None: - return text - if len(text.encode('utf-8')) > limit: - newlimit = limit - 3 - while len(text.encode('utf-8')) > newlimit: - text = text[:(newlimit - len(text.encode('utf-8'))) / 4] - text += '...' - return text - - @classmethod - def prepare(cls, input_filenames, output_dir='', verbose=False): - from lxml import etree - from librarian import DirDocProvider, ParseError - from librarian.parser import WLDocument - from copy import deepcopy - import os.path - - xml = etree.fromstring( - """ - """ - "" - ) - product = etree.fromstring(""" - - - - - - - Jan - Kowalski - - - 0.0 - PL - """) - - try: - for main_input in input_filenames: - if verbose: - print(main_input) - path, fname = os.path.realpath(main_input).rsplit('/', 1) - provider = DirDocProvider(path) - slug, ext = os.path.splitext(fname) - - outfile_dir = os.path.join(output_dir, slug) - makedirs(os.path.join(output_dir, slug)) - - doc = WLDocument.from_file(main_input, provider=provider) - info = doc.book_info - - product_elem = deepcopy(product) - product_elem[0].text = cls.utf_trunc(slug, 100) - product_elem[1].text = cls.utf_trunc(info.title, 255) - product_elem[2].text = cls.utf_trunc(info.description, 255) - product_elem[3].text = cls.utf_trunc(info.source_name, 3000) - product_elem[4][0][0].text = cls.utf_trunc( - u' '.join(info.author.first_names), 100 - ) - product_elem[4][0][1].text = cls.utf_trunc( - info.author.last_name, 100 - ) - xml.append(product_elem) - - cover.VirtualoCover(info).save( - os.path.join(outfile_dir, slug+'.jpg') - ) - outfile = os.path.join(outfile_dir, '1.epub') - outfile_sample = os.path.join(outfile_dir, '1.sample.epub') - doc.save_output_file(doc.as_epub(), output_path=outfile) - doc.save_output_file(doc.as_epub(doc, sample=25), - output_path=outfile_sample) - outfile = os.path.join(outfile_dir, '1.mobi') - outfile_sample = os.path.join(outfile_dir, '1.sample.mobi') - doc.save_output_file(doc.as_mobi(cover=cover.VirtualoCover), - output_path=outfile) - doc.save_output_file( - doc.as_mobi(doc, cover=cover.VirtualoCover, sample=25), - output_path=outfile_sample) - except ParseError as e: - print('%(file)s:%(name)s:%(message)s' % { - 'file': main_input, - 'name': e.__class__.__name__, - 'message': e.message - }) - - with open(os.path.join( - output_dir, 'import_products.xml' - ), 'w') as xml_file: - xml_file.write( - etree.tostring( - xml, pretty_print=True, encoding='unicode' - ).encode('utf-8') - ) - xml_file.close() diff --git a/src/librarian/pdf.py b/src/librarian/pdf.py index b32395f..94d14cf 100644 --- a/src/librarian/pdf.py +++ b/src/librarian/pdf.py @@ -1,7 +1,5 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # """PDF creation library. @@ -9,8 +7,7 @@ Creates one big XML from the book and its children, converts it to LaTeX with TeXML, then runs it by XeLaTeX. """ -from __future__ import print_function, unicode_literals - +import io import os import os.path import shutil @@ -19,12 +16,13 @@ import re from copy import deepcopy from subprocess import call, PIPE from itertools import chain +import urllib.parse +import urllib.request from PIL import Image from Texml.processor import process from lxml import etree from lxml.etree import XMLSyntaxError, XSLTApplyError -import six from librarian.dcparser import Person from librarian.parser import WLDocument @@ -294,15 +292,15 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, # add customizations if customizations is not None: - root.set('customizations', u','.join(customizations)) + root.set('customizations', ','.join(customizations)) # add editors info editors = document.editors() if editors: - root.set('editors', u', '.join(sorted( + root.set('editors', ', '.join(sorted( editor.readable() for editor in editors))) if document.book_info.funders: - root.set('funders', u', '.join(document.book_info.funders)) + root.set('funders', ', '.join(document.book_info.funders)) if document.book_info.thanks: root.set('thanks', document.book_info.thanks) @@ -325,11 +323,11 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, temp = mkdtemp('-wl2pdf') for i, ilustr in enumerate(document.edoc.findall('//ilustr')): - url = six.moves.urllib.parse.urljoin( + url = urllib.parse.urljoin( base_url, ilustr.get('src') ) - imgfile = six.moves.urllib.request.urlopen(url) + imgfile = urllib.request.urlopen(url) img = Image.open(imgfile) th_format, ext, media_type = { @@ -371,7 +369,7 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, tex_path = os.path.join(temp, 'doc.tex') fout = open(tex_path, 'wb') - process(six.BytesIO(texml), fout, 'utf-8') + process(io.BytesIO(texml), fout, 'utf-8') fout.close() del texml diff --git a/src/librarian/pdf/wl.cls b/src/librarian/pdf/wl.cls index d1b3087..aa6abc2 100644 --- a/src/librarian/pdf/wl.cls +++ b/src/librarian/pdf/wl.cls @@ -332,7 +332,7 @@ Letters={SmallCaps,UppercaseSmallCaps} \ifflaglessadvertising \else \href{\bookurl}{Ta lektura}, podobnie jak tysiące innych, jest dostępna on-line na stronie - \href{http://www.wolnelektury.pl/}{wolnelektury.pl}. + \href{https://wolnelektury.pl/}{wolnelektury.pl}. \vspace{.5em} \fi @@ -341,8 +341,8 @@ Letters={SmallCaps,UppercaseSmallCaps} \vspace{.5em} \fi - Utwór opracowany został w ramach projektu \href{http://www.wolnelektury.pl/}{Wolne Lektury} - przez \href{http://nowoczesnapolska.org.pl}{fundację Nowoczesna Polska}. + Utwór opracowany został w ramach projektu \href{https://wolnelektury.pl/}{Wolne Lektury} + przez \href{https://fundacja.wolnelektury.pl}{fundację Wolne Lektury}. \end{minipage} \noindent \rule{\linewidth}{0.4pt} @@ -375,7 +375,7 @@ Letters={SmallCaps,UppercaseSmallCaps} Wszystkie materiały dodatkowe (przypisy, motywy literackie) są udostępnione na \href{https://artlibre.org/licence/lal/pl/}{Licencji Wolnej Sztuki 1.3}. - Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania + Fundacja Wolne Lektury zastrzega sobie prawa do wydania krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich i prawach pokrewnych. Wykorzystując zasoby z Wolnych Lektur, należy pamiętać o zapisach licencji oraz zasadach, które spisaliśmy @@ -413,7 +413,7 @@ Letters={SmallCaps,UppercaseSmallCaps} \vspace{.6em} \emph{Wesprzyj Wolne Lektury!} - Wolne Lektury to projekt fundacji Nowoczesna Polska – organizacji + Wolne Lektury to projekt fundacji Wolne Lektury – organizacji pożytku publicznego działającej na rzecz wolności korzystania z dóbr kultury. @@ -423,13 +423,13 @@ Letters={SmallCaps,UppercaseSmallCaps} \vspace{.6em} \emph{Jak możesz pomóc?} - Przekaż 1\% podatku na rozwój Wolnych Lektur: - Fundacja Nowoczesna Polska, KRS 0000070056. + Przekaż 1,5\% podatku na rozwój Wolnych Lektur: + Fundacja Wolne Lektury, KRS 0000070056. - Dołącz do \href{https://wolnelektury.pl/towarzystwo/}{Towarzystwa Przyjaciół Wolnych Lektur} i pomóż nam rozwijać bibliotekę. + \href{https://wolnelektury.pl/pomagam/}{Wspieraj Wolne Lektury} i pomóż nam rozwijać bibliotekę. Przekaż darowiznę na konto: - \href{http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/}{szczegóły na stronie Fundacji}. + \href{https://fundacja.wolnelektury.pl/pomoz-nam/darowizna/}{szczegóły na stronie Fundacji}. \color{black} } diff --git a/src/librarian/pdf/wl2tex.xslt b/src/librarian/pdf/wl2tex.xslt index 1377bbb..bb61d10 100644 --- a/src/librarian/pdf/wl2tex.xslt +++ b/src/librarian/pdf/wl2tex.xslt @@ -2,7 +2,7 @@ Wesprzyj Wolne Lektury!

    - Wolne Lektury to projekt fundacji Nowoczesna Polska – organizacji + Wolne Lektury to projekt fundacji Wolne Lektury – organizacji pożytku publicznego działającej na rzecz wolności korzystania z dóbr kultury.

    @@ -27,17 +27,17 @@

    Logo 1%
    Przekaż 1% podatku na rozwój Wolnych Lektur:
    - Fundacja Nowoczesna Polska
    + Fundacja Wolne Lektury
    KRS 0000070056

    - Dołącz do Towarzystwa Przyjaciół Wolnych Lektur i pomóż nam rozwijać bibliotekę. + Wspieraj Wolne Lektury i pomóż nam rozwijać bibliotekę.

    Przekaż darowiznę na konto: - szczegóły + szczegóły na stronie Fundacji.

    diff --git a/src/librarian/res/text/template.txt b/src/librarian/res/text/template.txt index c85dabf..c675b62 100644 --- a/src/librarian/res/text/template.txt +++ b/src/librarian/res/text/template.txt @@ -5,7 +5,7 @@ Ta lektura, podobnie jak tysiące innych, dostępna jest na stronie wolnelektury.pl. Wersja lektury w opracowaniu merytorycznym i krytycznym (przypisy i motywy) dostępna jest na stronie %(url)s. -Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Nowoczesna Polska. +Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Wolne Lektury. %(license_description)s%(source)s%(publisher)s diff --git a/src/librarian/sponsor.py b/src/librarian/sponsor.py index 1374cda..ce4c03b 100644 --- a/src/librarian/sponsor.py +++ b/src/librarian/sponsor.py @@ -1,10 +1,6 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - from librarian import get_resource diff --git a/src/librarian/text.py b/src/librarian/text.py index d4eaf34..d3df5fe 100644 --- a/src/librarian/text.py +++ b/src/librarian/text.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import copy from librarian import functions, OutputFile, get_resource from lxml import etree import io import os -import six functions.reg_substitute_entities() @@ -75,7 +70,7 @@ def transform(wldoc, flags=None, **options): "Wszystkie materiały dodatkowe (przypisy, motywy literackie) są " "udostępnione na Licencji Wolnej Sztuki 1.3: " "https://artlibre.org/licence/lal/pl/\n" - "Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania " + "Fundacja Wolne Lektury zastrzega sobie prawa do wydania " "krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich " "i prawach pokrewnych.\nWykorzystując zasoby z Wolnych Lektur, " "należy pamiętać o zapisach licencji oraz zasadach, które " @@ -105,7 +100,7 @@ def transform(wldoc, flags=None, **options): ) funders = ', '.join(parsed_dc.funders) if funders: - funders = u"\n\nPublikację wsparli i wsparły: %s." % funders + funders = "\n\nPublikację wsparli i wsparły: %s." % funders publisher = '\n\nWydawca: ' + ', '.join(parsed_dc.publisher) isbn = getattr(parsed_dc, 'isbn_txt', None) if isbn: @@ -126,7 +121,7 @@ def transform(wldoc, flags=None, **options): 'description': description, 'url': url, 'license_description': license_description, - 'text': six.text_type(result), + 'text': str(result), 'source': source, 'contributors': contributors, 'funders': funders, @@ -134,5 +129,5 @@ def transform(wldoc, flags=None, **options): 'isbn': isbn, }).encode('utf-8') else: - result = six.text_type(result).encode('utf-8') + result = str(result).encode('utf-8') return OutputFile.from_bytes(b"\r\n".join(result.splitlines()) + b"\r\n") diff --git a/src/librarian/util.py b/src/librarian/util.py index 63e7996..805cefd 100644 --- a/src/librarian/util.py +++ b/src/librarian/util.py @@ -2,10 +2,7 @@ # by Paul Winkler # http://code.activestate.com/recipes/81611-roman-numerals/ # PSFL (GPL compatible) -from __future__ import print_function, unicode_literals - import os -import six def int_to_roman(input): @@ -94,7 +91,7 @@ def roman_to_int(input): ... ValueError: input is not a valid roman numeral: IL """ - if not isinstance(input, six.text_type): + if not isinstance(input, str): raise TypeError("expected string, got %s" % type(input)) input = input.upper() nums = ['M', 'D', 'C', 'L', 'X', 'V', 'I'] diff --git a/src/librarian/xslt/book2html.xslt b/src/librarian/xslt/book2html.xslt index c0567e8..390d147 100644 --- a/src/librarian/xslt/book2html.xslt +++ b/src/librarian/xslt/book2html.xslt @@ -2,7 +2,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -     -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -     diff --git a/src/librarian/xslt/wl2html_base.xslt b/src/librarian/xslt/wl2html_base.xslt deleted file mode 100644 index 3341658..0000000 --- a/src/librarian/xslt/wl2html_base.xslt +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - editable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - - - -
    -     -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    Uwaga! Tekst poza paragrafem

    -

    ##

    -
    -     -     -     - - - - - - - - - -     - -     - - - -     diff --git a/src/librarian/xslt/wl2html_full.xslt b/src/librarian/xslt/wl2html_full.xslt deleted file mode 100644 index 30381c3..0000000 --- a/src/librarian/xslt/wl2html_full.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - -
    - - - - - - - - - - -
    -     - -     \ No newline at end of file diff --git a/src/librarian/xslt/wl2html_partial.xslt b/src/librarian/xslt/wl2html_partial.xslt deleted file mode 100644 index 0e5e27b..0000000 --- a/src/librarian/xslt/wl2html_partial.xslt +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/files/dcparser/andersen_brzydkie_kaczatko.out b/tests/files/dcparser/andersen_brzydkie_kaczatko.out index 32a1d3c..a5be7f8 100644 --- a/tests/files/dcparser/andersen_brzydkie_kaczatko.out +++ b/tests/files/dcparser/andersen_brzydkie_kaczatko.out @@ -1,19 +1,19 @@ { - 'publisher': [u'Fundacja Nowoczesna Polska'], - 'about': u'http://wiki.wolnepodreczniki.pl/Lektury:Andersen/Brzydkie_kaczątko', - 'source_name': u'Andersen, Hans Christian (1805-1875), Baśnie, Gebethner i Wolff, wyd. 7, Kraków, 1925', - 'author': u'Andersen, Hans Christian', - 'url': u'http://wolnelektury.pl/katalog/lektura/brzydkie-kaczatko', - 'created_at': u'2007-08-14', - 'title': u'Brzydkie kaczątko', - 'kind': u'Epika', - 'source_url': u'http://www.polona.pl/dlibra/doccontent2?id=3563&dirids=4', - 'translators': [u'Niewiadomska, Cecylia'], - 'released_to_public_domain_at': u'1925', - 'epoch': u'Romantyzm', - 'genre': u'Baśń', - 'technical_editors': [u'Gałecki, Dariusz'], - 'license_description': u'Domena publiczna - tłumacz Cecylia Niewiadomska zm. 1925', - 'audiences': [u'SP1'], - 'language': u'pol', + 'publisher': ['Fundacja Wolne Lektury'], + 'about': 'http://redakcja.wolnelektury.pl/documents/book/brzydkie-kaczatko/', + 'source_name': 'Andersen, Hans Christian (1805-1875), Baśnie, Gebethner i Wolff, wyd. 7, Kraków, 1925', + 'author': 'Andersen, Hans Christian', + 'url': 'http://wolnelektury.pl/katalog/lektura/brzydkie-kaczatko', + 'created_at': '2007-08-14', + 'title': 'Brzydkie kaczątko', + 'kind': 'Epika', + 'source_url': 'http://www.polona.pl/dlibra/doccontent2?id=3563&dirids=4', + 'translators': ['Niewiadomska, Cecylia'], + 'released_to_public_domain_at': '1925', + 'epoch': 'Romantyzm', + 'genre': 'Baśń', + 'technical_editors': ['Gałecki, Dariusz'], + 'license_description': 'Domena publiczna - tłumacz Cecylia Niewiadomska zm. 1925', + 'audiences': ['SP1'], + 'language': 'pol', } diff --git a/tests/files/dcparser/andersen_brzydkie_kaczatko.xml b/tests/files/dcparser/andersen_brzydkie_kaczatko.xml index d653a9b..406bf0a 100644 --- a/tests/files/dcparser/andersen_brzydkie_kaczatko.xml +++ b/tests/files/dcparser/andersen_brzydkie_kaczatko.xml @@ -1,10 +1,10 @@ - + Andersen, Hans Christian Brzydkie kaczątko Niewiadomska, Cecylia Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Romantyzm Epika Baśń @@ -21,4 +21,4 @@ SP1 pol - \ No newline at end of file + diff --git a/tests/files/dcparser/biedrzycki_akslop.out b/tests/files/dcparser/biedrzycki_akslop.out index 588a4b7..75d4ed5 100644 --- a/tests/files/dcparser/biedrzycki_akslop.out +++ b/tests/files/dcparser/biedrzycki_akslop.out @@ -1,19 +1,19 @@ { - 'editors': [u'Sekuła, Aleksandra'], - 'publisher': [u'Fundacja Nowoczesna Polska'], - 'about': 'http://wiki.wolnepodreczniki.pl/Lektury:Biedrzycki/Akslop', - 'source_name': u'Miłosz Biedrzycki, * ("Gwiazdka"), Fundacja "brulion", Kraków-Warszawa, 1993', - 'author': u'Biedrzycki, Miłosz', - 'url': u'http://wolnelektury.pl/katalog/lektura/akslop', - 'created_at': u'2009-06-04', - 'title': u'Akslop', - 'kind': u'Liryka', - 'source_url': u'http://free.art.pl/mlb/gwiazdka.html#t1', - 'epoch': u'Współczesność', - 'genre': u'Wiersz', - 'technical_editors': [u'Sutkowska, Olga'], - 'license': u'http://creativecommons.org/licenses/by-sa/3.0/', - 'license_description': u'Creative Commons Uznanie Autorstwa - Na Tych Samych Warunkach 3.0.PL', - 'audiences': [u'L'], - 'language': u'pol', + 'editors': ['Sekuła, Aleksandra'], + 'publisher': ['Fundacja Wolne Lektury'], + 'about': 'http://redakcja.wolnelektury.pl/documents/book/akslop/', + 'source_name': 'Miłosz Biedrzycki, * ("Gwiazdka"), Fundacja "brulion", Kraków-Warszawa, 1993', + 'author': 'Biedrzycki, Miłosz', + 'url': 'http://wolnelektury.pl/katalog/lektura/akslop', + 'created_at': '2009-06-04', + 'title': 'Akslop', + 'kind': 'Liryka', + 'source_url': 'http://free.art.pl/mlb/gwiazdka.html#t1', + 'epoch': 'Współczesność', + 'genre': 'Wiersz', + 'technical_editors': ['Sutkowska, Olga'], + 'license': 'http://artlibre.org/licence/lal/pl/', + 'license_description': 'Licencja Wolnej Sztuki 1.3', + 'audiences': ['L'], + 'language': 'pol', } diff --git a/tests/files/dcparser/biedrzycki_akslop.xml b/tests/files/dcparser/biedrzycki_akslop.xml index da0cd9f..a4ea455 100644 --- a/tests/files/dcparser/biedrzycki_akslop.xml +++ b/tests/files/dcparser/biedrzycki_akslop.xml @@ -1,11 +1,11 @@ - + Biedrzycki, Miłosz Akslop Sekuła, Aleksandra Sutkowska, Olga - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Współczesność Liryka Wiersz @@ -13,8 +13,8 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> http://wolnelektury.pl/katalog/lektura/akslop http://free.art.pl/mlb/gwiazdka.html#t1 Miłosz Biedrzycki, * ("Gwiazdka"), Fundacja "brulion", Kraków-Warszawa, 1993 - Creative Commons Uznanie Autorstwa - Na Tych Samych Warunkach 3.0.PL - http://creativecommons.org/licenses/by-sa/3.0/ + Licencja Wolnej Sztuki 1.3 + http://artlibre.org/licence/lal/pl/ xml text text @@ -22,4 +22,4 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> L pol - \ No newline at end of file + diff --git a/tests/files/dcparser/kochanowski_piesn7.out b/tests/files/dcparser/kochanowski_piesn7.out index f6526ad..ad00a60 100644 --- a/tests/files/dcparser/kochanowski_piesn7.out +++ b/tests/files/dcparser/kochanowski_piesn7.out @@ -1,20 +1,20 @@ { - 'publisher': [u'Fundacja Nowoczesna Polska'], - 'about': u'http://wiki.wolnepodreczniki.pl/Lektury:Kochanowski/Pieśni/Pieśń_VII_(1)', - 'source_name': u'Kochanowski, Jan (1530-1584), Dzieła polskie, tom 1, oprac. Julian Krzyżanowski, wyd. 8, Państwowy Instytut Wydawniczy, Warszawa, 1976', - 'author': u'Kochanowski, Jan', - 'url': u'http://wolnelektury.pl/katalog/lektura/piesni-ksiegi-pierwsze-piesn-vii-trudna-rada-w-tej-mierze-pr', - 'created_at': u'2007-08-31', - 'title': u'Pieśń VII (Trudna rada w tej mierze: przyjdzie się rozjechać...)', - 'kind': u'Liryka', - 'source_url': u'http://www.polona.pl/Content/1499', - 'released_to_public_domain_at': u'1584', - 'epoch': u'Renesans', - 'genre': u'Pieśń', - 'technical_editors': [u'Gałecki, Dariusz'], - 'license_description': u'Domena publiczna - Jan Kochanowski zm. 1584 ', - 'editors': [u'Sekuła, Aleksandra', u'Krzyżanowski, Julian', u'Otwinowska, Barbara'], - 'audiences': [u'L'], - 'language': u'pol', + 'publisher': ['Fundacja Wolne Lektury'], + 'about': 'http://redakcja.wolnelektury.pl/documents/book/piesni-ksiegi-pierwsze-piesn-vii/', + 'source_name': 'Kochanowski, Jan (1530-1584), Dzieła polskie, tom 1, oprac. Julian Krzyżanowski, wyd. 8, Państwowy Instytut Wydawniczy, Warszawa, 1976', + 'author': 'Kochanowski, Jan', + 'url': 'http://wolnelektury.pl/katalog/lektura/piesni-ksiegi-pierwsze-piesn-vii-trudna-rada-w-tej-mierze-pr', + 'created_at': '2007-08-31', + 'title': 'Pieśń VII (Trudna rada w tej mierze: przyjdzie się rozjechać...)', + 'kind': 'Liryka', + 'source_url': 'http://www.polona.pl/Content/1499', + 'released_to_public_domain_at': '1584', + 'epoch': 'Renesans', + 'genre': 'Pieśń', + 'technical_editors': ['Gałecki, Dariusz'], + 'license_description': 'Domena publiczna - Jan Kochanowski zm. 1584 ', + 'editors': ['Sekuła, Aleksandra', 'Krzyżanowski, Julian', 'Otwinowska, Barbara'], + 'audiences': ['L'], + 'language': 'pol', } diff --git a/tests/files/dcparser/kochanowski_piesn7.xml b/tests/files/dcparser/kochanowski_piesn7.xml index b4d8d2e..06c0af8 100644 --- a/tests/files/dcparser/kochanowski_piesn7.xml +++ b/tests/files/dcparser/kochanowski_piesn7.xml @@ -1,5 +1,5 @@ - + Kochanowski, Jan Pieśń VII (Trudna rada w tej mierze: przyjdzie się rozjechać...) http://www.wolnelektury.pl/lektura/piesni-ksiegi-pierwsze @@ -7,7 +7,7 @@ Krzyżanowski, Julian Otwinowska, Barbara Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Renesans Liryka Pieśń diff --git a/tests/files/dcparser/mickiewicz_rybka.out b/tests/files/dcparser/mickiewicz_rybka.out index d13ebf7..d994b1a 100644 --- a/tests/files/dcparser/mickiewicz_rybka.out +++ b/tests/files/dcparser/mickiewicz_rybka.out @@ -1,20 +1,20 @@ { - 'editors': [u'Sekuła, Aleksandra', u'Kallenbach, Józef'], - 'publisher': [u'Fundacja Nowoczesna Polska'], - 'about': 'http://wiki.wolnepodreczniki.pl/Lektury:Mickiewicz/Ballady/Rybka', - 'source_name': u'Mickiewicz, Adam (1798-1855), Poezje, tom 1 (Wiersze młodzieńcze - Ballady i romanse - Wiersze do r. 1824), Krakowska Spółdzielnia Wydawnicza, wyd. 2 zwiększone, Kraków, 1922', - 'author': u'Mickiewicz, Adam', - 'url': u'http://wolnelektury.pl/katalog/lektura/ballady-i-romanse-rybka', - 'created_at': u'2007-09-06', - 'title': u'Rybka', - 'kind': u'Liryka', - 'source_url': u'http://www.polona.pl/Content/2222', - 'released_to_public_domain_at': u'1855', - 'epoch': u'Romantyzm', - 'genre': u'Ballada', - 'technical_editors': [u'Sutkowska, Olga'], - 'license_description': u'Domena publiczna - Adam Mickiewicz zm. 1855', - 'audiences': [u'SP2', u'G', u'L'], - 'language': u'pol', + 'editors': ['Sekuła, Aleksandra', 'Kallenbach, Józef'], + 'publisher': ['Fundacja Wolne Lektury'], + 'about': 'http://redakcja.wolnelektury.pl/documents/book/rybka/', + 'source_name': 'Mickiewicz, Adam (1798-1855), Poezje, tom 1 (Wiersze młodzieńcze - Ballady i romanse - Wiersze do r. 1824), Krakowska Spółdzielnia Wydawnicza, wyd. 2 zwiększone, Kraków, 1922', + 'author': 'Mickiewicz, Adam', + 'url': 'http://wolnelektury.pl/katalog/lektura/ballady-i-romanse-rybka', + 'created_at': '2007-09-06', + 'title': 'Rybka', + 'kind': 'Liryka', + 'source_url': 'http://www.polona.pl/Content/2222', + 'released_to_public_domain_at': '1855', + 'epoch': 'Romantyzm', + 'genre': 'Ballada', + 'technical_editors': ['Sutkowska, Olga'], + 'license_description': 'Domena publiczna - Adam Mickiewicz zm. 1855', + 'audiences': ['SP2', 'G', 'L'], + 'language': 'pol', } diff --git a/tests/files/dcparser/mickiewicz_rybka.xml b/tests/files/dcparser/mickiewicz_rybka.xml index 0796a5b..3954c09 100644 --- a/tests/files/dcparser/mickiewicz_rybka.xml +++ b/tests/files/dcparser/mickiewicz_rybka.xml @@ -1,12 +1,12 @@ - + Mickiewicz, Adam Rybka http://www.wolnelektury.pl/lektura/ballady-i-romanse Sekuła, Aleksandra Kallenbach, Józef Sutkowska, Olga - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Romantyzm Liryka Ballada @@ -25,4 +25,4 @@ L pol - \ No newline at end of file + diff --git a/tests/files/dcparser/sofokles_antygona.out b/tests/files/dcparser/sofokles_antygona.out index 86bf068..f460a4e 100644 --- a/tests/files/dcparser/sofokles_antygona.out +++ b/tests/files/dcparser/sofokles_antygona.out @@ -1,22 +1,22 @@ { - 'editors': [u'Sekuła, Aleksandra'], - 'publisher': [u'Fundacja Nowoczesna Polska'], - 'about': 'http://wiki.wolnepodreczniki.pl/Lektury:Sofokles/Antygona', - 'source_name': u'Sofokles (496-406 a.C.), Antygona, Zakład Narodowy im. Ossolińskich, wyd. 7, Lwów, 1939', - 'author': u'Sofokles', - 'url': u'http://wolnelektury.pl/katalog/lektura/antygona', - 'created_at': u'2007-08-30', - 'title': u'Antygona', - 'kind': u'Dramat', - 'source_url': u'http://www.polona.pl/Content/3768', - 'translators': [u'Morawski, Kazimierz'], - 'released_to_public_domain_at': u'1925', - 'epoch': u'Starożytność', - 'genre': u'Tragedia', - 'technical_editors': [u'Gałecki, Dariusz'], - 'license_description': u'Domena publiczna - tłumacz Kazimierz Morawski zm. 1925', - 'language': u'pol', - 'audiences': [u'G'], - 'language': u'pol', + 'editors': ['Sekuła, Aleksandra'], + 'publisher': ['Fundacja Wolne Lektury'], + 'about': 'http://redakcja.wolnelektury.pl/documents/book/antygona/', + 'source_name': 'Sofokles (496-406 a.C.), Antygona, Zakład Narodowy im. Ossolińskich, wyd. 7, Lwów, 1939', + 'author': 'Sofokles', + 'url': 'http://wolnelektury.pl/katalog/lektura/antygona', + 'created_at': '2007-08-30', + 'title': 'Antygona', + 'kind': 'Dramat', + 'source_url': 'http://www.polona.pl/Content/3768', + 'translators': ['Morawski, Kazimierz'], + 'released_to_public_domain_at': '1925', + 'epoch': 'Starożytność', + 'genre': 'Tragedia', + 'technical_editors': ['Gałecki, Dariusz'], + 'license_description': 'Domena publiczna - tłumacz Kazimierz Morawski zm. 1925', + 'language': 'pol', + 'audiences': ['G'], + 'language': 'pol', } diff --git a/tests/files/dcparser/sofokles_antygona.xml b/tests/files/dcparser/sofokles_antygona.xml index 4acb2d4..96b2903 100644 --- a/tests/files/dcparser/sofokles_antygona.xml +++ b/tests/files/dcparser/sofokles_antygona.xml @@ -1,11 +1,11 @@ - + Sofokles Antygona Sekuła, Aleksandra Morawski, Kazimierz Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Starożytność Dramat Tragedia @@ -22,4 +22,4 @@ G pol - \ No newline at end of file + diff --git a/tests/files/dcserialize/andersen_brzydkie_kaczatko.xml b/tests/files/dcserialize/andersen_brzydkie_kaczatko.xml index d653a9b..406bf0a 100644 --- a/tests/files/dcserialize/andersen_brzydkie_kaczatko.xml +++ b/tests/files/dcserialize/andersen_brzydkie_kaczatko.xml @@ -1,10 +1,10 @@ - + Andersen, Hans Christian Brzydkie kaczątko Niewiadomska, Cecylia Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Romantyzm Epika Baśń @@ -21,4 +21,4 @@ SP1 pol - \ No newline at end of file + diff --git a/tests/files/dcserialize/biedrzycki_akslop.xml b/tests/files/dcserialize/biedrzycki_akslop.xml index da0cd9f..a4ea455 100644 --- a/tests/files/dcserialize/biedrzycki_akslop.xml +++ b/tests/files/dcserialize/biedrzycki_akslop.xml @@ -1,11 +1,11 @@ - + Biedrzycki, Miłosz Akslop Sekuła, Aleksandra Sutkowska, Olga - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Współczesność Liryka Wiersz @@ -13,8 +13,8 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> http://wolnelektury.pl/katalog/lektura/akslop http://free.art.pl/mlb/gwiazdka.html#t1 Miłosz Biedrzycki, * ("Gwiazdka"), Fundacja "brulion", Kraków-Warszawa, 1993 - Creative Commons Uznanie Autorstwa - Na Tych Samych Warunkach 3.0.PL - http://creativecommons.org/licenses/by-sa/3.0/ + Licencja Wolnej Sztuki 1.3 + http://artlibre.org/licence/lal/pl/ xml text text @@ -22,4 +22,4 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> L pol - \ No newline at end of file + diff --git a/tests/files/dcserialize/kochanowski_piesn7.xml b/tests/files/dcserialize/kochanowski_piesn7.xml index b4d8d2e..ff11096 100644 --- a/tests/files/dcserialize/kochanowski_piesn7.xml +++ b/tests/files/dcserialize/kochanowski_piesn7.xml @@ -1,5 +1,5 @@ - + Kochanowski, Jan Pieśń VII (Trudna rada w tej mierze: przyjdzie się rozjechać...) http://www.wolnelektury.pl/lektura/piesni-ksiegi-pierwsze @@ -7,7 +7,7 @@ Krzyżanowski, Julian Otwinowska, Barbara Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Renesans Liryka Pieśń diff --git a/tests/files/dcserialize/mickiewicz_rybka.xml b/tests/files/dcserialize/mickiewicz_rybka.xml index 0796a5b..3954c09 100644 --- a/tests/files/dcserialize/mickiewicz_rybka.xml +++ b/tests/files/dcserialize/mickiewicz_rybka.xml @@ -1,12 +1,12 @@ - + Mickiewicz, Adam Rybka http://www.wolnelektury.pl/lektura/ballady-i-romanse Sekuła, Aleksandra Kallenbach, Józef Sutkowska, Olga - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Romantyzm Liryka Ballada @@ -25,4 +25,4 @@ L pol - \ No newline at end of file + diff --git a/tests/files/dcserialize/sofokles_antygona.xml b/tests/files/dcserialize/sofokles_antygona.xml index 4acb2d4..96b2903 100644 --- a/tests/files/dcserialize/sofokles_antygona.xml +++ b/tests/files/dcserialize/sofokles_antygona.xml @@ -1,11 +1,11 @@ - + Sofokles Antygona Sekuła, Aleksandra Morawski, Kazimierz Gałecki, Dariusz - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Starożytność Dramat Tragedia @@ -22,4 +22,4 @@ G pol - \ No newline at end of file + diff --git a/tests/files/example-wl.xml b/tests/files/example-wl.xml index 9950f9d..04691b8 100644 --- a/tests/files/example-wl.xml +++ b/tests/files/example-wl.xml @@ -12,7 +12,7 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"> Utworu, Tłumacz Literacki, Redaktor Techniczny, Redaktor -Fundacja Nowoczesna Polska +Fundacja Wolne Lektury period type genre diff --git a/tests/files/picture/angelus-novus.xml b/tests/files/picture/angelus-novus.xml index 85fa554..1e70828 100644 --- a/tests/files/picture/angelus-novus.xml +++ b/tests/files/picture/angelus-novus.xml @@ -1,9 +1,9 @@ - + Klee, Paul Angelus Novus - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury Sekuła, Aleksandra Kwiatkowska, Katarzyna Trzeciak, Weronika diff --git a/tests/files/text/asnyk_miedzy_nami_expected.fb2 b/tests/files/text/asnyk_miedzy_nami_expected.fb2 index b9e4e13..3aef918 100644 --- a/tests/files/text/asnyk_miedzy_nami_expected.fb2 +++ b/tests/files/text/asnyk_miedzy_nami_expected.fb2 @@ -8,9 +8,9 @@

    Utwór opracowany został w ramach projektu - Wolne Lektury - przez fundację - Nowoczesna Polska. + Wolne Lektury + przez fundację + Wolne Lektury.

    @@ -36,11 +36,15 @@ Prócz tych wspólnych, jasnych zdrojów, Z których serce zachwyt piło; - Prócz pierwiosnków i powojów,— + Prócz pierwiosnków[1] i powojów,— Między nami nic nie było!
    - + +
    +

    pierwiosnek — taki kwiatek [przypis edytorski]

    +
    + diff --git a/tests/files/text/asnyk_miedzy_nami_expected.html b/tests/files/text/asnyk_miedzy_nami_expected.html index 91c1135..34fccdd 100644 --- a/tests/files/text/asnyk_miedzy_nami_expected.html +++ b/tests/files/text/asnyk_miedzy_nami_expected.html @@ -34,8 +34,14 @@
    Prócz tych wspólnych, jasnych zdrojów,
    Z których serce zachwyt piło;
    - 15
    Prócz pierwiosnków i powojów,—
    + 15
    Prócz pierwiosnków[1] i powojów,—
    Między nami nic nie było!
    +
    +

    Przypisy

    +
    +[1]

    pierwiosnek — taki kwiatek [przypis edytorski]

    +
    +
    diff --git a/tests/files/text/asnyk_miedzy_nami_expected.legacy.html b/tests/files/text/asnyk_miedzy_nami_expected.legacy.html index a0eba08..7004f5a 100644 --- a/tests/files/text/asnyk_miedzy_nami_expected.legacy.html +++ b/tests/files/text/asnyk_miedzy_nami_expected.legacy.html @@ -34,8 +34,14 @@
    Prócz tych wspólnych, jasnych zdrojów,
    Z których serce zachwyt piło;
    - 15
    Prócz pierwiosnków i powojów,—
    + 15
    Prócz pierwiosnków[1] i powojów,—
    Między nami nic nie było!
    +
    +

    Przypisy

    +
    +[1]

    pierwiosnek — taki kwiatek [przypis edytorski]

    +
    +
    diff --git a/tests/files/text/asnyk_miedzy_nami_expected.txt b/tests/files/text/asnyk_miedzy_nami_expected.txt index 8baee83..c7439f0 100644 --- a/tests/files/text/asnyk_miedzy_nami_expected.txt +++ b/tests/files/text/asnyk_miedzy_nami_expected.txt @@ -31,18 +31,18 @@ Między nami nic nie było! Ta lektura, podobnie jak tysiące innych, dostępna jest na stronie wolnelektury.pl. Wersja lektury w opracowaniu merytorycznym i krytycznym (przypisy i motywy) dostępna jest na stronie http://wolnelektury.pl/katalog/lektura/miedzy-nami-nic-nie-bylo. -Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Nowoczesna Polska. +Utwór opracowany został w ramach projektu Wolne Lektury przez fundację Wolne Lektury. Wszystkie zasoby Wolnych Lektur możesz swobodnie wykorzystywać, publikować i rozpowszechniać pod warunkiem zachowania warunków licencji i zgodnie z Zasadami wykorzystania Wolnych Lektur. Ten utwór jest w domenie publicznej. Wszystkie materiały dodatkowe (przypisy, motywy literackie) są udostępnione na Licencji Wolnej Sztuki 1.3: https://artlibre.org/licence/lal/pl/ -Fundacja Nowoczesna Polska zastrzega sobie prawa do wydania krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich i prawach pokrewnych. +Fundacja Wolne Lektury zastrzega sobie prawa do wydania krytycznego zgodnie z art. Art.99(2) Ustawy o prawach autorskich i prawach pokrewnych. Wykorzystując zasoby z Wolnych Lektur, należy pamiętać o zapisach licencji oraz zasadach, które spisaliśmy w Zasadach wykorzystania Wolnych Lektur: https://wolnelektury.pl/info/zasady-wykorzystania/ Zapoznaj się z nimi, zanim udostępnisz dalej nasze książki. Tekst opracowany na podstawie: (Asnyk, Adam) El...y (1838-1897), Poezye, t. 3, Gebethner i Wolff, wyd. nowe poprzedzone słowem wstępnym St. Krzemińskiego, Warszawa, 1898 -Wydawca: Fundacja Nowoczesna Polska +Wydawca: Fundacja Wolne Lektury Publikacja zrealizowana w ramach projektu Wolne Lektury (http://wolnelektury.pl). Reprodukcja cyfrowa wykonana przez Bibliotekę Narodową z egzemplarza pochodzącego ze zbiorów BN. diff --git a/tests/files/text/asnyk_miedzy_nami_refs.html b/tests/files/text/asnyk_miedzy_nami_refs.html new file mode 100644 index 0000000..703d79c --- /dev/null +++ b/tests/files/text/asnyk_miedzy_nami_refs.html @@ -0,0 +1,6 @@ +sec7 +
    +
    Prócz tych wspólnych, jasnych zdrojów,
    +
    Z których serce zachwyt piło;
    +
    Prócz pierwiosnków
    +
    diff --git a/tests/files/text/asnyk_zbior.xml b/tests/files/text/asnyk_zbior.xml index 6a781f3..5811e42 100644 --- a/tests/files/text/asnyk_zbior.xml +++ b/tests/files/text/asnyk_zbior.xml @@ -5,7 +5,7 @@ Asnyk, Adam Poezye -Fundacja Nowoczesna Polska +Fundacja Wolne Lektury Pozytywizm Liryka Wiersz diff --git a/tests/files/text/do-mlodych.xml b/tests/files/text/do-mlodych.xml index 21fa522..267c713 100644 --- a/tests/files/text/do-mlodych.xml +++ b/tests/files/text/do-mlodych.xml @@ -4,7 +4,7 @@ Do młodych Sekuła, Aleksandra Sutkowska, Olga -Fundacja Nowoczesna Polska +Fundacja Wolne Lektury Pozytywizm Liryka Wiersz @@ -67,4 +67,4 @@ Prawdziwa mądrość niechaj was pogodzi:/ I wasze gwiazdy, o zdobywcy młodzi,/ W ciemnościach pogasną znów! - \ No newline at end of file + diff --git a/tests/files/text/miedzy-nami-nic-nie-bylo.xml b/tests/files/text/miedzy-nami-nic-nie-bylo.xml index 84f2911..b899372 100644 --- a/tests/files/text/miedzy-nami-nic-nie-bylo.xml +++ b/tests/files/text/miedzy-nami-nic-nie-bylo.xml @@ -11,7 +11,7 @@ Sutkowska, Olga Fikcyjny, Adam Fikcyjny, Adam -Fundacja Nowoczesna Polska +Fundacja Wolne Lektury Pozytywizm Liryka Wiersz diff --git a/tests/test_dcparser.py b/tests/test_dcparser.py index 64e98d7..9e2b3ef 100644 --- a/tests/test_dcparser.py +++ b/tests/test_dcparser.py @@ -1,50 +1,48 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - +import unittest from librarian import dcparser from lxml import etree -from nose.tools import * from os.path import splitext from tests.utils import get_all_fixtures -import codecs -from datetime import date - - -def check_dcparser(xml_file, result_file): - xml = open(xml_file, 'rb').read() - result = codecs.open(result_file, encoding='utf-8').read() - info = dcparser.BookInfo.from_bytes(xml).to_dict() - should_be = eval(result) - for key in should_be: - assert_equals(info[key], should_be[key]) - - -def test_dcparser(): - for fixture in get_all_fixtures('dcparser', '*.xml'): - base_name = splitext(fixture)[0] - yield check_dcparser, fixture, base_name + '.out' - - -def check_serialize(xml_file): - xml = open(xml_file, 'rb').read() - info = dcparser.BookInfo.from_bytes(xml) - - # serialize - serialized = etree.tostring(info.to_etree(), encoding='unicode').encode('utf-8') - # then parse again - info_bis = dcparser.BookInfo.from_bytes(serialized) - - # check if they are the same - for key in vars(info): - assert_equals(getattr(info, key), getattr(info_bis, key)) - for key in vars(info_bis): - assert_equals(getattr(info, key), getattr(info_bis, key)) -def test_serialize(): - for fixture in get_all_fixtures('dcparser', '*.xml'): - yield check_serialize, fixture +class MetaTests(unittest.TestCase): + def check_dcparser(self, xml_file, result_file): + with open(xml_file, 'rb') as f: + xml = f.read() + with open(result_file) as f: + result = f.read() + info = dcparser.BookInfo.from_bytes(xml).to_dict() + should_be = eval(result) + for key in should_be: + self.assertEqual(info[key], should_be[key]) + + + def test_dcparser(self): + for fixture in get_all_fixtures('dcparser', '*.xml'): + base_name = splitext(fixture)[0] + with self.subTest(name=base_name): + self.check_dcparser(fixture, base_name + '.out') + + def check_serialize(self, xml_file): + with open(xml_file, 'rb') as f: + xml = f.read() + info = dcparser.BookInfo.from_bytes(xml) + + # serialize + serialized = etree.tostring(info.to_etree(), encoding='unicode').encode('utf-8') + # then parse again + info_bis = dcparser.BookInfo.from_bytes(serialized) + + # check if they are the same + for key in vars(info): + self.assertEqual(getattr(info, key), getattr(info_bis, key)) + for key in vars(info_bis): + self.assertEqual(getattr(info, key), getattr(info_bis, key)) + + def test_serialize(self): + for fixture in get_all_fixtures('dcparser', '*.xml'): + with self.subTest(name=fixture): + self.check_serialize(fixture) diff --git a/tests/test_doctests.py b/tests/test_doctests.py new file mode 100644 index 0000000..17bec5d --- /dev/null +++ b/tests/test_doctests.py @@ -0,0 +1,16 @@ +import unittest +import doctest +import librarian.util +import librarian.epub +import librarian.meta.types.wluri +import librarian.pdf +import librarian.embeds.mathml + + +def load_tests(loader, tests, ignore): + tests.addTests(doctest.DocTestSuite(librarian.util)) + tests.addTests(doctest.DocTestSuite(librarian.epub)) + tests.addTests(doctest.DocTestSuite(librarian.meta.types.wluri)) + tests.addTests(doctest.DocTestSuite(librarian.pdf)) + tests.addTests(doctest.DocTestSuite(librarian.embeds.mathml)) + return tests diff --git a/tests/test_epub.py b/tests/test_epub.py index c7a262b..f3986c4 100644 --- a/tests/test_epub.py +++ b/tests/test_epub.py @@ -1,100 +1,90 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import subprocess +import unittest from zipfile import ZipFile from ebooklib import epub from lxml import html -from nose.tools import * from librarian import DirDocProvider -from librarian.parser import WLDocument +from librarian.builders import EpubBuilder +from librarian.document import WLDocument from tests.utils import get_fixture -def test_transform(): - epub_file = WLDocument.from_file( - get_fixture('text', 'asnyk_zbior.xml'), - provider=DirDocProvider(get_fixture('text', '')) - ).as_epub(cover=True, flags=['without_fonts']) - zipf = ZipFile(epub_file.get_file()) - - # Check contributor list. - last = zipf.open('EPUB/last.xhtml') - tree = html.parse(last) - editors_attribution = False - for par in tree.findall("//p"): - if par.text.startswith(u'Opracowanie redakcyjne i przypisy:'): - editors_attribution = True - assert_equal( - par.text.rstrip(), - u'Opracowanie redakcyjne i przypisy: ' - u'Adam Fikcyjny, Aleksandra Sekuła, Olga Sutkowska.') - assert_true(editors_attribution) - - # Check that we have a valid EPUB. - assert_equal( - subprocess.call([ - 'epubcheck', '-quiet', epub_file.get_filename() - ]), - 0 - ) +class EpubTests(unittest.TestCase): + def test_transform(self): + epub_file = EpubBuilder().build( + WLDocument( + get_fixture('text', 'asnyk_zbior.xml'), + provider=DirDocProvider(get_fixture('text', '')) + ) + ) + zipf = ZipFile(epub_file.get_file()) - book = epub.read_epub(epub_file.get_filename()) + # Check contributor list. + last = zipf.open('EPUB/last.xhtml') + tree = html.parse(last) + editors_attribution = False + for par in tree.findall("//p"): + if par.text.startswith('Opracowanie redakcyjne i przypisy:'): + editors_attribution = True + self.assertEqual( + par.text.rstrip(), + 'Opracowanie redakcyjne i przypisy: ' + 'Adam Fikcyjny, Aleksandra Sekuła, Olga Sutkowska.') + self.assertTrue(editors_attribution) - # Check that guide items are there. - assert_equals( - book.guide, - [ - {'href': 'part1.xhtml', 'title': 'Początek', 'type': 'text'}, - {'href': 'cover.xhtml', 'title': 'Okładka', 'type': 'cover'} - ] - ) + # Check that we have a valid EPUB. + self.assertEqual( + subprocess.call([ + 'epubcheck', '-quiet', epub_file.get_filename() + ]), + 0 + ) - # Check that metadata is there. - DC = "http://purl.org/dc/elements/1.1/" - OPF = "http://www.idpf.org/2007/opf" + book = epub.read_epub(epub_file.get_filename()) - assert_equals( - book.get_metadata(OPF, "cover"), - [(None, {'name': 'cover', 'content': 'cover-img'})] - ) - assert_equals( - book.get_metadata(DC, "title"), - [('Poezye', {})] - ) - assert_equals( - book.get_metadata(DC, "language"), - [('pl', {})] - ) - assert_equals( - book.get_metadata(DC, "identifier"), - [('http://wolnelektury.pl/katalog/lektura/poezye', { - 'id': 'id', - })] - ) - assert_equals( - book.get_metadata(DC, "creator"), - [('Adam Asnyk', {"id": "creator0"})] - ) - assert_equals( - book.get_metadata(DC, "publisher"), - [('Fundacja Nowoczesna Polska', {})] - ) - assert_equals( - book.get_metadata(DC, "date"), - [("2007-09-06", {})] - ) + # Check that guide items are there. + self.assertEqual( + book.guide, + [ + {'href': 'cover.xhtml', 'title': 'Okładka', 'type': 'cover'}, + {'href': 'part1.xhtml', 'title': 'Początek', 'type': 'text'}, + ] + ) + # Check that metadata is there. + DC = "http://purl.org/dc/elements/1.1/" + OPF = "http://www.idpf.org/2007/opf" -def test_transform_hyphenate(): - epub = WLDocument.from_file( - get_fixture('text', 'asnyk_zbior.xml'), - provider=DirDocProvider(get_fixture('text', '')) - ).as_epub( - flags=['without_fonts'], - hyphenate=True - ).get_file() + self.assertEqual( + book.get_metadata(OPF, "cover"), + [(None, {'name': 'cover', 'content': 'cover-img'})] + ) + self.assertEqual( + book.get_metadata(DC, "title"), + [('Poezye', {})] + ) + self.assertEqual( + book.get_metadata(DC, "language"), + [('pl', {})] + ) + self.assertEqual( + book.get_metadata(DC, "identifier"), + [('http://wolnelektury.pl/katalog/lektura/poezye', { + 'id': 'id', + })] + ) + self.assertEqual( + book.get_metadata(DC, "creator"), + [('Adam Asnyk', {"id": "creator0"})] + ) + self.assertEqual( + book.get_metadata(DC, "publisher"), + [('Fundacja Wolne Lektury', {})] + ) + self.assertEqual( + book.get_metadata(DC, "date"), + [("2007-09-06", {})] + ) diff --git a/tests/test_fb2.py b/tests/test_fb2.py index 2b8de67..28c4efd 100644 --- a/tests/test_fb2.py +++ b/tests/test_fb2.py @@ -1,22 +1,22 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - +from unittest import TestCase from librarian import NoDublinCore from librarian.parser import WLDocument -from nose.tools import * from .utils import get_fixture -def test_transform(): - expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.fb2') +class FB2Tests(TestCase): + maxDiff = None + + def test_transform(self): + expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.fb2') - text = WLDocument.from_file( + text = WLDocument.from_file( get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml') - ).as_fb2().get_bytes() + ).as_fb2().get_bytes().decode('utf-8') - assert_equal(text, open(expected_output_file_path, 'rb').read()) + with open(expected_output_file_path, 'rb') as f: + self.assertEqual(text, f.read().decode('utf-8')) diff --git a/tests/test_html.py b/tests/test_html.py index a3d042d..1d698fd 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -1,17 +1,12 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - -import io +import re from unittest import TestCase from librarian import NoDublinCore from librarian.builders import builders from librarian.document import WLDocument from librarian.parser import WLDocument as LegacyWLDocument -from nose.tools import * from .utils import get_fixture @@ -25,7 +20,9 @@ class TransformTest(TestCase): get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml') ).as_html().get_bytes().decode('utf-8') - self.assertEqual(html, io.open(expected_output_file_path).read()) + html = re.sub(r'idm\d+', 'idmNNN', html) + with open(expected_output_file_path) as f: + self.assertEqual(f.read(), html) def test_transform(self): expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.html') @@ -33,26 +30,26 @@ class TransformTest(TestCase): filename=get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml') ).build(builders['html']).get_bytes().decode('utf-8') - self.assertEqual(html, io.open(expected_output_file_path).read()) - - -@raises(NoDublinCore) -def test_no_dublincore(): - LegacyWLDocument.from_file( - get_fixture('text', 'asnyk_miedzy_nami_nodc.xml') - ).as_html() + with open(expected_output_file_path) as f: + self.assertEqual(html, f.read()) + def test_no_dublincore(self): + with self.assertRaises(NoDublinCore): + LegacyWLDocument.from_file( + get_fixture('text', 'asnyk_miedzy_nami_nodc.xml') + ).as_html() -def test_passing_parse_dublincore_to_transform(): - """Passing parse_dublincore=False to transform omits DublinCore parsing.""" - LegacyWLDocument.from_file( + def test_passing_parse_dublincore_to_transform(self): + """Passing parse_dublincore=False to transform omits DublinCore parsing.""" + LegacyWLDocument.from_file( get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'), parse_dublincore=False, ).as_html() - -def test_empty(): - assert not LegacyWLDocument.from_bytes( - b'', - parse_dublincore=False, - ).as_html() + def test_empty(self): + self.assertIsNone( + LegacyWLDocument.from_bytes( + b'', + parse_dublincore=False, + ).as_html() + ) diff --git a/tests/test_html_annotations.py b/tests/test_html_annotations.py index 410577c..bdbe4fb 100644 --- a/tests/test_html_annotations.py +++ b/tests/test_html_annotations.py @@ -1,24 +1,37 @@ -# -*- coding: utf-8 -from __future__ import unicode_literals - +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# +import unittest from librarian.parser import WLDocument from librarian.html import extract_annotations -from nose.tools import eq_ - - -def _test_annotation(expected, got, name): - assert got[0].startswith('anchor-'), "%s: Unexpected anchor: '%s', should begin with 'anchor-'" % (name, got[0]) - eq_(expected[0], got[1], "%s: Unexpected type, expected '%s', got '%s'" % (name, expected[0], got[1])) - eq_(expected[1], got[2], "%s: Unexpected qualifier, expected '%s', got '%s'" % (name, expected[1], got[2])) - eq_(expected[2], got[3], "%s: Unexpected text representation, expected '%s', got '%s'" % - (name, expected[2], got[3])) - exp_html = '
    %s
    ' % (expected[0], expected[3]) - eq_(exp_html, got[4], "%s: Unexpected html representation, expected '%s', got '%s'" % (name, exp_html, got[4])) - -def test_annotations(): - annotations = ( +class AnnotationsTests(unittest.TestCase): + def _test_annotation(self, expected, got, name): + self.assertTrue( + got[0].startswith('anchor-'), + "%s: Unexpected anchor: '%s', should begin with 'anchor-'" % (name, got[0]) + ) + self.assertEqual( + expected[0], got[1], + "%s: Unexpected type, expected '%s', got '%s'" % (name, expected[0], got[1]) + ) + self.assertEqual( + expected[1], got[2], + "%s: Unexpected qualifier, expected '%s', got '%s'" % (name, expected[1], got[2]) + ) + self.assertEqual( + expected[2], got[3], + "%s: Unexpected text representation, expected '%s', got '%s'" % (name, expected[2], got[3]) + ) + exp_html = '
    %s
    ' % (expected[0], expected[3]) + self.assertEqual( + exp_html, got[4], + "%s: Unexpected html representation, expected '%s', got '%s'" % (name, exp_html, got[4]) + ) + + def test_annotations(self): + annotations = ( ('', ( 'pe', [], @@ -101,15 +114,15 @@ def test_annotations(): '\u2014 częściej: gemajn, szeregowiec w wojsku polskim cudzoziemskiego autoramentu. [przypis edytorski]

    ' ), 'Footnote with multiple and qualifiers and emphasis.'), - - ) - - xml_src = ''' %s ''' % "".join( - t[0] for t in annotations) - html = WLDocument.from_bytes( - xml_src.encode('utf-8'), - parse_dublincore=False).as_html().get_file() - res_annotations = list(extract_annotations(html)) - - for i, (src, expected, name) in enumerate(annotations): - yield _test_annotation, expected, res_annotations[i], name + ) + + xml_src = ''' %s ''' % "".join( + t[0] for t in annotations) + html = WLDocument.from_bytes( + xml_src.encode('utf-8'), + parse_dublincore=False).as_html().get_file() + res_annotations = list(extract_annotations(html)) + + for i, (src, expected, name) in enumerate(annotations): + with self.subTest(i=i): + self._test_annotation(expected, res_annotations[i], name) diff --git a/tests/test_html_fragments.py b/tests/test_html_fragments.py index 5c89d68..2d55362 100644 --- a/tests/test_html_fragments.py +++ b/tests/test_html_fragments.py @@ -1,10 +1,6 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import unittest from librarian.html import extract_fragments from .utils import get_fixture @@ -19,5 +15,6 @@ class FragmentsTest(unittest.TestCase): closed_fragments, open_fragments = extract_fragments( get_fixture('text', 'asnyk_miedzy_nami_expected.legacy.html')) assert not open_fragments - fragments_text = u"\n\n".join(u"%s: %s\n%s" % (f.id, f.themes, f) for f in sorted(closed_fragments.values(), key=lambda f: f.id)) - self.assertEqual(fragments_text, open(expected_output_file_path, 'rb').read().decode('utf-8')) + fragments_text = "\n\n".join("%s: %s\n%s" % (f.id, f.themes, f) for f in sorted(closed_fragments.values(), key=lambda f: f.id)) + with open(expected_output_file_path, 'rb') as f: + self.assertEqual(fragments_text, f.read().decode('utf-8')) diff --git a/tests/test_html_transform_abstrakt.py b/tests/test_html_transform_abstrakt.py index dbe22c0..4f36b80 100644 --- a/tests/test_html_transform_abstrakt.py +++ b/tests/test_html_transform_abstrakt.py @@ -1,20 +1,17 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - +import unittest from librarian.parser import WLDocument from librarian.html import transform_abstrakt -from nose.tools import * from .utils import get_fixture -def test_fragments(): - transform_abstrakt( - WLDocument.from_file( - get_fixture('text', 'abstrakt.xml'), - parse_dublincore=False - ).edoc.getroot().find('.//abstrakt') - ) +class AbstractTests(unittest.TestCase): + def test_abstrakt(self): + transform_abstrakt( + WLDocument.from_file( + get_fixture('text', 'abstrakt.xml'), + parse_dublincore=False + ).edoc.getroot().find('.//abstrakt') + ) diff --git a/tests/test_mobi.py b/tests/test_mobi.py index 3b29e72..b96513e 100644 --- a/tests/test_mobi.py +++ b/tests/test_mobi.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - +import unittest from zipfile import ZipFile from lxml import html -from nose.tools import * from librarian import DirDocProvider -from librarian.parser import WLDocument +from librarian.builders import MobiBuilder +from librarian.document import WLDocument from tests.utils import get_fixture -def test_transform(): - mobi = WLDocument.from_file( - get_fixture('text', 'asnyk_zbior.xml'), - provider=DirDocProvider(get_fixture('text', '')) - ).as_mobi(converter_path='true').get_file() +class MobiTests(unittest.TestCase): + def test_transform(self): + mobi = MobiBuilder().build( + WLDocument( + get_fixture('text', 'asnyk_zbior.xml'), + provider=DirDocProvider(get_fixture('text', '')) + ) + ) diff --git a/tests/test_pdf.py b/tests/test_pdf.py index 98d1fa6..902bcf1 100644 --- a/tests/test_pdf.py +++ b/tests/test_pdf.py @@ -1,27 +1,25 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import re from tempfile import NamedTemporaryFile -from nose.tools import * +import unittest from librarian import DirDocProvider from librarian.parser import WLDocument from .utils import get_fixture -def test_transform(): - temp = NamedTemporaryFile(delete=False) - temp.close() - WLDocument.from_file( +class PdfTests(unittest.TestCase): + def test_transform(self): + temp = NamedTemporaryFile(delete=False) + temp.close() + WLDocument.from_file( get_fixture('text', 'asnyk_zbior.xml'), provider=DirDocProvider(get_fixture('text', '')) ).as_pdf(save_tex=temp.name) - tex = open(temp.name, 'rb').read().decode('utf-8') + with open(temp.name, 'rb') as f: + tex = f.read().decode('utf-8') - # Check contributor list. - editors = re.search(r'\\def\\editors\{Opracowanie redakcyjne i przypisy: ([^}]*?)\.\s*\}', tex) - assert_equal(editors.group(1), u"Adam Fikcyjny, Aleksandra Sekuła, Olga Sutkowska") + # Check contributor list. + editors = re.search(r'\\def\\editors\{Opracowanie redakcyjne i przypisy: ([^}]*?)\.\s*\}', tex) + self.assertEqual(editors.group(1), "Adam Fikcyjny, Aleksandra Sekuła, Olga Sutkowska") diff --git a/tests/test_picture.py b/tests/test_picture.py index 7d12b1d..afa4da8 100644 --- a/tests/test_picture.py +++ b/tests/test_picture.py @@ -1,59 +1,56 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - +from os import path +import unittest from librarian import picture, dcparser from tests.utils import get_all_fixtures, get_fixture -from os import path - -def test_wlpictureuri(): - uri = picture.WLPictureURI('http://wolnelektury.pl/katalog/obraz/angelus-novus') +class PictureTests(unittest.TestCase): + def test_wlpictureuri(self): + uri = picture.WLPictureURI('http://wolnelektury.pl/katalog/obraz/angelus-novus') -def check_load(xml_file): - pi = dcparser.parse(xml_file, picture.PictureInfo) - assert pi is not None - assert isinstance(pi, picture.PictureInfo) + def check_load(self, xml_file): + pi = dcparser.parse(xml_file, picture.PictureInfo) + self.assertIsNotNone(pi) + self.assertIsInstance(pi, picture.PictureInfo) - -def test_load(): - for fixture in get_all_fixtures('picture', '*.xml'): - yield check_load, fixture - - -def test_wlpicture(): - wlp = picture.WLPicture.from_file(open(get_fixture('picture', 'angelus-novus.xml'))) - pi = wlp.picture_info - - # from nose.tools import set_trace; set_trace() - assert pi.type[0] == u"Image" - assert pi.mime_type == u'image/jpeg' == wlp.mime_type - assert wlp.slug == 'angelus-novus' - - assert path.exists(wlp.image_path) + def test_load(self): + for fixture in get_all_fixtures('picture', '*.xml'): + with self.subTest(fixture=fixture): + self.check_load(fixture) + + def test_wlpicture(self): + with open(get_fixture('picture', 'angelus-novus.xml')) as f: + wlp = picture.WLPicture.from_file(f) + pi = wlp.picture_info + + self.assertEqual(pi.type[0], "Image") + self.assertEqual(pi.mime_type, 'image/jpeg') + self.assertEqual(wlp.mime_type, 'image/jpeg') + self.assertEqual(wlp.slug, 'angelus-novus') + self.assertTrue(path.exists(wlp.image_path)) - f = wlp.image_file() - f.close() - - -def test_picture_parts(): - wlp = picture.WLPicture.from_file(open(get_fixture('picture', 'angelus-novus.xml'))) - parts = list(wlp.partiter()) - expect_parts = 4 - assert len(parts) == expect_parts, "there should be %d parts of the picture" % expect_parts - motifs = set() - names = set() - - for p in parts: - for m in p['themes']: - motifs.add(m) - for p in parts: - if p['object']: - names.add(p['object']) - - assert motifs == {u'anioł historii', u'spojrzenie'}, "missing motifs, got: %s" % motifs - assert names == {u'obraz cały', u'skrzydło'}, 'missing objects, got: %s' % names + f = wlp.image_file() + f.close() + + + def test_picture_parts(self): + with open(get_fixture('picture', 'angelus-novus.xml')) as f: + wlp = picture.WLPicture.from_file(f) + parts = list(wlp.partiter()) + expect_parts = 4 + self.assertEqual(len(parts), expect_parts, "there should be %d parts of the picture" % expect_parts) + motifs = set() + names = set() + + for p in parts: + for m in p['themes']: + motifs.add(m) + for p in parts: + if p['object']: + names.add(p['object']) + + self.assertEqual(motifs, {'anioł historii', 'spojrzenie'}, "missing motifs, got: %s" % motifs) + self.assertEqual(names, {'obraz cały', 'skrzydło'}, 'missing objects, got: %s' % names) diff --git a/tests/test_ref.py b/tests/test_ref.py new file mode 100644 index 0000000..2383866 --- /dev/null +++ b/tests/test_ref.py @@ -0,0 +1,32 @@ +# This file is part of Librarian, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. +# +from unittest import TestCase +from librarian.builders import builders +from librarian.document import WLDocument +from tests.utils import get_fixture +from lxml import etree + + +class RefTests(TestCase): + def test_snippet(self): + doc = WLDocument(filename=get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')) + doc._compat_assign_section_ids() + + refs = [] + for ref in doc.references(): + snippet = ref.get_snippet() + b = builders['html']() + + for s in snippet: + s.html_build(b) + refs.append( + '\n'.join(( + ref.get_link(), + b.output().get_bytes().decode('utf-8') + )) + ) + output = '\n\n'.join(refs) + with open(get_fixture('text', 'asnyk_miedzy_nami_refs.html')) as f: + self.assertEqual(output, f.read()) + diff --git a/tests/test_text.py b/tests/test_text.py index c566a48..7797530 100644 --- a/tests/test_text.py +++ b/tests/test_text.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from __future__ import unicode_literals - import unittest from librarian import NoDublinCore from librarian.builders import builders from librarian.parser import WLDocument as LegacyWLDocument from librarian.document import WLDocument -from nose.tools import * from .utils import get_fixture @@ -48,17 +43,15 @@ class TextTests(unittest.TestCase): with open(expected_output_file_path, 'rb') as f: self.assertEqual(text, f.read().decode('utf-8')) + def test_no_dublincore(self): + with self.assertRaises(NoDublinCore): + LegacyWLDocument.from_file( + get_fixture('text', 'asnyk_miedzy_nami_nodc.xml') + ).as_text() -@raises(NoDublinCore) -def test_no_dublincore(): - LegacyWLDocument.from_file( - get_fixture('text', 'asnyk_miedzy_nami_nodc.xml') - ).as_text() - - -def test_passing_parse_dublincore_to_transform(): - """Passing parse_dublincore=False to the constructor omits DublinCore parsing.""" - LegacyWLDocument.from_file( + def test_passing_parse_dublincore_to_transform(self): + """Passing parse_dublincore=False to the constructor omits DublinCore parsing.""" + LegacyWLDocument.from_file( get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'), parse_dublincore=False, ).as_text() diff --git a/tests/uat/main.xml b/tests/uat/main.xml index ceae2e7..bd64d87 100644 --- a/tests/uat/main.xml +++ b/tests/uat/main.xml @@ -4,7 +4,7 @@ Radek Czajka Test Document 2020-01-08 - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury pol main gnu gpl diff --git a/tests/uat/parent.xml b/tests/uat/parent.xml index 544032a..a3b0bd3 100644 --- a/tests/uat/parent.xml +++ b/tests/uat/parent.xml @@ -4,7 +4,7 @@ Radek Czajka Test Parent Document 2020-01-08 - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury pol wl-test-parent gnu agpl diff --git a/tests/uat/part2.xml b/tests/uat/part2.xml index 2459748..1356f56 100644 --- a/tests/uat/part2.xml +++ b/tests/uat/part2.xml @@ -4,7 +4,7 @@ Radek Czajka Test Document, Part 2 2020-01-08 - Fundacja Nowoczesna Polska + Fundacja Wolne Lektury pol part2 gnu gpl diff --git a/tests/utils.py b/tests/utils.py index 7da206c..616313a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from os.path import realpath, join, dirname import glob diff --git a/tox.ini b/tox.ini index e508014..ecf3ecc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,16 @@ [tox] envlist = clean, - py{36,37,38,39}, + py{37,38,39,310,311}, stats [testenv] deps = - nose coverage passenv = HOME ; Needed to find locally installed fonts when testing PDF production. download = true commands = - nosetests --with-coverage --cover-package=librarian -d --with-doctest --with-xunit --exe + coverage run install_command = pip install numpy; pip install --extra-index-url https://py.mdrn.pl/simple {packages} [testenv:clean] @@ -23,7 +22,17 @@ deps = coverage [testenv:stats] basepython = python3 commands = + coverage combine coverage report coverage html deps = coverage +[coverage:run] +parallel = True +source_pkgs = librarian +command_line = -m unittest + +[coverage:paths] +source = src/ + .tox/*/lib/*/site-packages/ + -- 2.20.1 From d9dde9439398869b39fd68c5756d89ae4f27d52c Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 28 Jul 2023 13:48:56 +0200 Subject: [PATCH 04/16] Add main thema field. Move to calver. --- setup.py | 2 +- src/librarian/dcparser.py | 5 +++-- src/librarian/meta/types/text.py | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0b8c47a..9c8120c 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='2.6.1', + version='23.07', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/dcparser.py b/src/librarian/dcparser.py index 1d3c2f3..34723f2 100644 --- a/src/librarian/dcparser.py +++ b/src/librarian/dcparser.py @@ -361,8 +361,9 @@ class BookInfo(WorkInfo): required=False), Field(DCNS('subject.genre'), 'genres', text.Genre, salias='genre', multiple=True, required=False), - Field(WLNS('category.legimi'), 'legimi', text.LegimiCategory, required=False), - Field(WLNS('category.thema'), 'thema', text.ThemaCategory, required=False, multiple=True), + Field('category.legimi', 'legimi', text.LegimiCategory, required=False), + Field('category.thema.main', 'thema_main', text.ThemaCategory, required=False), + Field('category.thema', 'thema', text.MainThemaCategory, required=False, multiple=True), Field(DCNS('subject.location'), 'location', required=False), Field(DCNS('contributor.translator'), 'translators', diff --git a/src/librarian/meta/types/text.py b/src/librarian/meta/types/text.py index 8010ec1..55e8261 100644 --- a/src/librarian/meta/types/text.py +++ b/src/librarian/meta/types/text.py @@ -25,6 +25,9 @@ class LegimiCategory(NameIdentifier): class ThemaCategory(NameIdentifier): pass +class MainThemaCategory(ThemaCategory): + pass + class Epoch(NameIdentifier): pass -- 2.20.1 From e2acc67a478455184e5e714e63a61e78ad37d787 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 28 Jul 2023 14:11:00 +0200 Subject: [PATCH 05/16] bugfix --- src/librarian/dcparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librarian/dcparser.py b/src/librarian/dcparser.py index 34723f2..910f5e1 100644 --- a/src/librarian/dcparser.py +++ b/src/librarian/dcparser.py @@ -362,8 +362,8 @@ class BookInfo(WorkInfo): Field(DCNS('subject.genre'), 'genres', text.Genre, salias='genre', multiple=True, required=False), Field('category.legimi', 'legimi', text.LegimiCategory, required=False), - Field('category.thema.main', 'thema_main', text.ThemaCategory, required=False), - Field('category.thema', 'thema', text.MainThemaCategory, required=False, multiple=True), + Field('category.thema.main', 'thema_main', text.MainThemaCategory, required=False), + Field('category.thema', 'thema', text.ThemaCategory, required=False, multiple=True), Field(DCNS('subject.location'), 'location', required=False), Field(DCNS('contributor.translator'), 'translators', -- 2.20.1 From adde01d89c27fb02056fd5c901ffea9ba1d9882f Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 28 Jul 2023 14:12:13 +0200 Subject: [PATCH 06/16] bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9c8120c..b4eb161 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='23.07', + version='23.07.1', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', -- 2.20.1 From 18db48c927f52d497aea34b5d0daf855902367a3 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 10 Aug 2023 18:21:01 +0200 Subject: [PATCH 07/16] move stats to L2 --- CHANGELOG.md | 49 ++++++++++++++++++++++++++ setup.py | 2 +- src/librarian/document.py | 74 ++++++++++++++++++++++++++++++++++++--- src/librarian/parser.py | 58 ------------------------------ 4 files changed, 120 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a36fd2f..a1cff15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,55 @@ This document records all notable changes to Librarian. +## 23.08 + +- Move statistics counter to L2 WLgit lDocument. + +## 23.07.1 + +- Add . +- Support Python 3.7--3.11. + +## 2.6.1 + +- Fix for better ignoring . + +## 2.6 + +- Change default cover to marquise. +- Add support for full predesigned covers to marquise. +- Remove support for changing actual cover class via coverClass. + +## 2.5.1 + +- Bugfix release. + +## 2.5 + +- Add html-snippet builder. +- Remove DateValue class. +- Fix some texts and tests. +- Drop Python < 3.6. Up to 3.9 is supported. + +## 2.4.13 + +- Added thema meta field. + +## 2.4.12 + +- Fix for marquise cover: allow scaling title text in all layouts. + +## 2.4.11.1 + +- Added assigning and preserving id attribute . + +## 2.4.10 + +- Added , , and . + +## 2.4.9 + +- Added verse counters to document statistics. ## 2.4.8 (2022-07-23) diff --git a/setup.py b/setup.py index b4eb161..0f7be1b 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='23.07.1', + version='23.8', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/document.py b/src/librarian/document.py index aa6f37f..2e9a4a5 100644 --- a/src/librarian/document.py +++ b/src/librarian/document.py @@ -1,13 +1,14 @@ # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # +from collections import Counter import gettext import os import re import urllib.request from lxml import etree from .parser import parser -from . import dcparser, DCNS, DirDocProvider +from . import dcparser, DCNS, RDFNS, DirDocProvider from .functions import lang_code_3to2 @@ -36,8 +37,12 @@ class WLDocument: def children(self): for part_uri in self.meta.parts or []: with self.provider.by_slug(part_uri.slug) as f: - yield type(self)(filename=f, provider=self.provider) - + try: + yield type(self)(filename=f, provider=self.provider) + except Exception as e: + + yield e + def build(self, builder, base_url=None, **kwargs): return builder(base_url=base_url).build(self, **kwargs) @@ -67,7 +72,7 @@ class WLDocument: i += 1 item.attrib['id'] = f'e{i}' i += 1 - + def _compat_assign_ordered_ids(self): """ Compatibility: ids in document order, to be roughly compatible with legacy @@ -121,3 +126,64 @@ class WLDocument: def references(self): return self.tree.findall('.//ref') + + def get_statistics(self): + def count_text(text, counter, in_fn=False, stanza=False): + if text: + text = re.sub(r'\s+', ' ', text) + + chars = len(text) if text.strip() else 0 + words = len(text.split()) if text.strip() else 0 + + counter['chars_with_fn'] += chars + counter['words_with_fn'] += words + if not in_fn: + counter['chars'] += chars + counter['words'] += words + if not stanza: + counter['chars_out_verse_with_fn'] += chars + if not in_fn: + counter['chars_out_verse'] += chars + + def count(elem, counter, in_fn=False, stanza=False): + if elem.tag in (RDFNS('RDF'), 'nota_red', 'abstrakt', 'uwaga', 'ekstra'): + return + if not in_fn and elem.tag in ('pa', 'pe', 'pr', 'pt', 'motyw'): + in_fn = True + if elem.tag == 'strofa': + # count verses now + #verses = len(elem.findall('.//br')) + 1 + verses = list(elem.get_verses()) + counter['verses_with_fn'] += len(verses) + if not in_fn: + counter['verses'] += len(verses) + stanza = True + + for child in verses: + count(child, counter, in_fn=in_fn, stanza=True) + else: + count_text(elem.text, counter, in_fn=in_fn, stanza=stanza) + for child in elem: + count(child, counter, in_fn=in_fn, stanza=stanza) + count_text(child.tail, counter, in_fn=in_fn, stanza=stanza) + + data = { + "self": Counter(), + "parts": [], + "total": { + } + } + + count(self.tree.getroot(), data['self']) + for k, v in data['self'].items(): + data['total'][k] = v + + for part in self.children: + if isinstance(part, Exception): + data['parts'].append((None, {'error': part})) + else: + data['parts'].append((part, part.get_statistics())) + for k, v in data['parts'][-1][1]['total'].items(): + data['total'][k] = data['total'].get(k, 0) + v + + return data diff --git a/src/librarian/parser.py b/src/librarian/parser.py index 484b8f9..b4e4c5c 100644 --- a/src/librarian/parser.py +++ b/src/librarian/parser.py @@ -67,64 +67,6 @@ class WLDocument: else: self.book_info = None - def get_statistics(self): - def count_text(text, counter, in_fn=False, stanza=False): - if text: - text = re.sub(r'\s+', ' ', text) - - chars = len(text) if text.strip() else 0 - words = len(text.split()) if text.strip() else 0 - - counter['chars_with_fn'] += chars - counter['words_with_fn'] += words - if not in_fn: - counter['chars'] += chars - counter['words'] += words - if not stanza: - counter['chars_out_verse_with_fn'] += chars - if not in_fn: - counter['chars_out_verse'] += chars - - def count(elem, counter, in_fn=False, stanza=False): - if elem.tag in (RDFNS('RDF'), 'nota_red', 'abstrakt', 'uwaga', 'ekstra'): - return - if not in_fn and elem.tag in ('pa', 'pe', 'pr', 'pt', 'motyw'): - in_fn = True - if elem.tag == 'strofa': - # count verses now - verses = len(elem.findall('.//br')) + 1 - counter['verses_with_fn'] += verses - if not in_fn: - counter['verses'] += verses - stanza = True - count_text(elem.text, counter, in_fn=in_fn, stanza=stanza) - for child in elem: - count(child, counter, in_fn=in_fn, stanza=stanza) - count_text(child.tail, counter, in_fn=in_fn, stanza=stanza) - - self.swap_endlines() - - data = { - "self": Counter(), - "parts": [], - "total": { - } - } - - count(self.edoc.getroot(), data['self']) - for k, v in data['self'].items(): - data['total'][k] = v - - for part in self.parts(pass_part_errors=True): - if isinstance(part, Exception): - data['parts'].append((None, {})) - else: - data['parts'].append((part, part.get_statistics())) - for k, v in data['parts'][-1][1]['total'].items(): - data['total'][k] = data['total'].get(k, 0) + v - - return data - @classmethod def from_bytes(cls, xml, *args, **kwargs): return cls.from_file(io.BytesIO(xml), *args, **kwargs) -- 2.20.1 From dcecf2226f792e051a230bb5fc68501ce7e06474 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 19 Oct 2023 12:09:58 +0200 Subject: [PATCH 08/16] Remove direct verse styling from html. --- CHANGELOG.md | 4 ++++ setup.py | 2 +- src/librarian/xslt/book2html.xslt | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1cff15..f523442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This document records all notable changes to Librarian. +## 23.10 + +- Remove direct verse styling from HTML. + ## 23.08 - Move statistics counter to L2 WLgit lDocument. diff --git a/setup.py b/setup.py index 0f7be1b..b14204f 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='23.8', + version='23.10', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/xslt/book2html.xslt b/src/librarian/xslt/book2html.xslt index 390d147..b009345 100644 --- a/src/librarian/xslt/book2html.xslt +++ b/src/librarian/xslt/book2html.xslt @@ -394,31 +394,31 @@
    + + verse - padding-left: 1em + verse-p - - - padding-left: em - - - padding-left: 1em - - + verse-indent + + verse-indent- + + - padding-left: 12em + verse-cont - text-align: right + verse-right - text-align: center + verse-center - + +
    -- 2.20.1 From 77004f7537a472419bf9701c8522a774a0c29245 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 5 Dec 2023 14:58:15 +0100 Subject: [PATCH 09/16] Add epub debugging. --- CHANGELOG.md | 4 ++++ setup.py | 2 +- src/librarian/builders/epub.py | 10 +++++++++- src/librarian/elements/base.py | 9 ++++++++- src/librarian/epubcheck.py | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 src/librarian/epubcheck.py diff --git a/CHANGELOG.md b/CHANGELOG.md index f523442..3a93be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This document records all notable changes to Librarian. +## 23.12 + +- Added debug version for epub and epubcheck utility. + ## 23.10 - Remove direct verse styling from HTML. diff --git a/setup.py b/setup.py index b14204f..cddab59 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='23.10', + version='23.12', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/builders/epub.py b/src/librarian/builders/epub.py index 8f21879..e009d4a 100644 --- a/src/librarian/builders/epub.py +++ b/src/librarian/builders/epub.py @@ -4,6 +4,7 @@ from datetime import date import io import os +import re import tempfile from ebooklib import epub from lxml import etree @@ -80,9 +81,11 @@ class EpubBuilder(Builder): isbn_field = 'isbn_epub' orphans = True - def __init__(self, *args, **kwargs): + def __init__(self, *args, debug=False, **kwargs): self.chars = set() self.fundr = 0 + self.debug = debug + self.splits = [] super().__init__(*args, **kwargs) def build(self, document, **kwargs): @@ -707,3 +710,8 @@ class EpubBuilder(Builder): file_name=name ) return name + + def process_comment(self, comment): + m = re.match(r'TRIM:(\d+)', comment.text) + if m is not None: + self.splits.append(comment.sourceline - int(m.group(1))) diff --git a/src/librarian/elements/base.py b/src/librarian/elements/base.py index 863436c..b0d16ed 100644 --- a/src/librarian/elements/base.py +++ b/src/librarian/elements/base.py @@ -136,6 +136,8 @@ class WLElement(etree.ElementBase): for i, child in enumerate(self): if isinstance(child, WLElement): getattr(child, build_method)(builder) + elif getattr(builder, 'debug') and child.tag is etree.Comment: + builder.process_comment(child) if self.CAN_HAVE_TEXT and child.tail: text = self.normalize_text(child.tail, builder) if self.STRIP and i == child_count - 1: @@ -198,7 +200,7 @@ class WLElement(etree.ElementBase): # TEMPORARY self.CAN_HAVE_TEXT = True self.STRIP = False - + start_chunk = self.EPUB_START_CHUNK and isinstance(self.getparent(), Master) if start_chunk: @@ -220,6 +222,11 @@ class WLElement(etree.ElementBase): attr = self.get_epub_attr(builder) if fragment: attr['id'] = fragment + if builder.debug: + chunkno, sourceline = 0, self.sourceline + if builder.splits: + chunkno, sourceline = len(builder.splits), sourceline - builder.splits[-1] + attr['data-debug'] = f'{chunkno}:{sourceline}' builder.start_element( self.EPUB_TAG, attr diff --git a/src/librarian/epubcheck.py b/src/librarian/epubcheck.py new file mode 100644 index 0000000..00bfb13 --- /dev/null +++ b/src/librarian/epubcheck.py @@ -0,0 +1,33 @@ +import json +import re +import subprocess +import zipfile + + +def epubcheck(filename): + p = subprocess.run( + [ + 'epubcheck', '-q', + '-j', '-', + filename + ], + capture_output=True + ) + output = json.loads(p.stdout) + epub = zipfile.ZipFile(filename) + messages = output.get('messages', []) + for message in messages: + for loc in message.get('locations', []): + if loc['path'].startswith('EPUB/part'): + with epub.open(loc['path']) as zfile: + text = zfile.read().decode('utf-8') + line = text.split('\n')[loc['line'] - 1][:loc['column'] - 1:] + debug = re.findall(r' data-debug="(\d+):(\d+)', line) + if debug: + debug = debug[-1] + loc['wl_chunk'] = int(debug[0]) + loc['wl_line'] = int(debug[1]) + return messages + + + -- 2.20.1 From d3d58ca2b55f820b1d5ce30260793e0848bb1247 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 30 Jan 2024 17:28:04 +0100 Subject: [PATCH 10/16] Support cover logo. --- src/librarian/cover.py | 1 + src/librarian/covers/marquise.py | 15 +++++++++-- src/librarian/covers/widgets/image.py | 39 +++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/librarian/cover.py b/src/librarian/cover.py index a3bd5cd..3581f59 100644 --- a/src/librarian/cover.py +++ b/src/librarian/cover.py @@ -163,6 +163,7 @@ class Cover: if format is not None: self.format = format self.set_size(width, height) + self.cover_logo = cover_logo def set_size(self, width, height): if width and height: diff --git a/src/librarian/covers/marquise.py b/src/librarian/covers/marquise.py index 6f33b32..0d64e9c 100644 --- a/src/librarian/covers/marquise.py +++ b/src/librarian/covers/marquise.py @@ -7,7 +7,7 @@ from .utils.color import algo_contrast_or_hue, luminance, is_very_bright from .utils.textbox import DoesNotFit from .widgets.author import AuthorBox from .widgets.background import Background -from .widgets.image import WLLogo, Label +from .widgets.image import WLLogo, Label, LogoSticker from .widgets.marquise import Marquise from .widgets.title import TitleBox @@ -21,6 +21,10 @@ class MarquiseCover(Cover): margin = 100 logo_h = 177 author_width = 1300 + sticker_size = 400 + sticker_padding_x = 30 + sticker_padding_y = 50 + sticker_radius = 10 title_box_top = 262 @@ -160,7 +164,14 @@ class MarquiseCover(Cover): ) WLLogo(self).apply(img, self.m.margin, self.m.margin, None, self.m.logo_h) - + + if self.cover_logo: + LogoSticker(self, self.cover_logo).apply( + img, + self.m.width - self.m.margin - self.m.sticker_size, + self.m.height - self.m.margin, + self.m.sticker_size, self.m.sticker_size, self.m.sticker_padding_x, self.m.sticker_padding_y, self.m.sticker_radius + ) for logo in self.additional_logos: LogoSticker(self, logo).apply(img, 0, 0) diff --git a/src/librarian/covers/widgets/image.py b/src/librarian/covers/widgets/image.py index 798dfaf..af1e687 100644 --- a/src/librarian/covers/widgets/image.py +++ b/src/librarian/covers/widgets/image.py @@ -2,6 +2,7 @@ # Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # import PIL.Image +import PIL.ImageDraw from librarian import get_resource from .base import Widget @@ -30,3 +31,41 @@ class Label(ImageWidget): else: return get_resource('res/cover/label_WLpolecaja.png') + +class LogoSticker(ImageWidget): + def __init__(self, cover, image_path): + self.image_path = image_path + + def apply(self, img, x, y, w, h, padding_x, padding_y, radius): + my_img = self.build(w, h, padding_x, padding_y, radius) + if my_img is not None: + img.paste( + my_img, + (round(x), round(y - my_img.size[1])), + my_img if self.transparency else None + ) + + + def build(self, w, h, padding_x, padding_y, radius): + img = PIL.Image.open(self.image_path) + uw, uh = w - 2 * padding_x, h - 2 * padding_y + if img.size[1] / img.size[0] > uh / uw: + img = img.resize((round(img.size[0] / img.size[1] * uh), uh)) + else: + img = img.resize((uw, round(img.size[1] / img.size[0] * uw))) + sz = w, img.size[1] + 2 * padding_y + sticker = PIL.Image.new('RGBA', sz) + draw = PIL.ImageDraw.Draw(sticker) + draw.rectangle((0, radius, sz[0], sz[1] - radius), (0, 0, 0)) + draw.rectangle((radius, 0, sz[0] - radius, sz[1]), (0, 0, 0)) + draw.ellipse((0, 0, 2 * radius, 2 * radius), (0, 0, 0)) + draw.ellipse((0, sz[1] - 2 * radius, 2 * radius, sz[1]), (0, 0, 0)) + draw.ellipse((sz[0] - 2 * radius, 0, sz[0], 2 * radius), (0, 0, 0)) + draw.ellipse((sz[0] - 2 * radius, sz[1] - 2 * radius, sz[0], sz[1]), (0, 0, 0)) + sticker.paste( + img, + ( + round(padding_x + (uw - img.size[0]) / 2), padding_y), + img + ) + return sticker -- 2.20.1 From e18331d927f54751163baf89bb2c93ae0c854a3b Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 30 Jan 2024 17:28:35 +0100 Subject: [PATCH 11/16] fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cddab59..6b04c15 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='23.12', + version='24.1', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', -- 2.20.1 From 2e508c48675d8fcf048b7dd9ad7caa7fbc23dff0 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 14 Feb 2024 10:53:18 +0100 Subject: [PATCH 12/16] bit longer author field --- src/librarian/covers/marquise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librarian/covers/marquise.py b/src/librarian/covers/marquise.py index 0d64e9c..0b2349a 100644 --- a/src/librarian/covers/marquise.py +++ b/src/librarian/covers/marquise.py @@ -20,7 +20,7 @@ class MarquiseCover(Cover): height = 2970 margin = 100 logo_h = 177 - author_width = 1300 + author_width = 1400 sticker_size = 400 sticker_padding_x = 30 sticker_padding_y = 50 -- 2.20.1 From b13f09caed970090efa8a6c7205d71cc82ff6c97 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 10 Apr 2024 13:00:30 +0200 Subject: [PATCH 13/16] Fixes. --- src/librarian/html.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/librarian/html.py b/src/librarian/html.py index c2f41c0..2919498 100644 --- a/src/librarian/html.py +++ b/src/librarian/html.py @@ -39,7 +39,7 @@ def transform_abstrakt(abstrakt_element): style = etree.parse(style_filename) xml = etree.tostring(abstrakt_element, encoding='unicode') document = etree.parse(io.StringIO( - xml.replace('abstrakt', 'dlugi_cytat') + xml.replace('', '', @@ -49,6 +49,10 @@ def transform_abstrakt(abstrakt_element): def add_image_sizes(tree, gallery_path, gallery_url, base_url): widths = [360, 600, 1200, 1800, 2400] + try: + os.makedirs(gallery_path) + except: + pass for i, ilustr in enumerate(tree.findall('//ilustr')): rel_path = ilustr.attrib['src'] -- 2.20.1 From 102460ac788a7307391852115d8f142e6e5c3cdd Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 10 Apr 2024 13:03:46 +0200 Subject: [PATCH 14/16] Fundraising in PDF. --- src/librarian/pdf.py | 27 ++++++++++++++++++++++++++- src/librarian/pdf/wl.cls | 1 + src/librarian/pdf/wl2tex.xslt | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/librarian/pdf.py b/src/librarian/pdf.py index 94d14cf..e5cf5bd 100644 --- a/src/librarian/pdf.py +++ b/src/librarian/pdf.py @@ -188,6 +188,29 @@ def hack_motifs(doc): break +def add_fundraising(doc, fundraising): + # Before each naglowek_rozdzial and naglowek_scena and in the end + spots = [] + for naglowek in doc.xpath('//naglowek_czesc|//naglowek_akt'): + spot = etree.Element('f_spot') + naglowek.addprevious(spot) + spots.append(spot) + spot = etree.Element('f_spot') + doc.getroot()[-1][-1].append(spot) + spots.append(spot) + e = len(spots) + nfunds = len(fundraising) + if e > 4 * nfunds: + nfunds *= 2 + for f in range(nfunds): + spot_index = int(f / nfunds * e) + spots[spot_index].set('active', 'true') + elem = etree.fromstring('' + fundraising[f % len(fundraising)] + '') + spots[spot_index].text = elem.text + for c in elem: + spots[spot_index].append(c) + + def parse_creator(doc): """Generates readable versions of creator and translator tags. @@ -242,7 +265,7 @@ def package_available(package, args='', verbose=False): def transform(wldoc, verbose=False, save_tex=None, morefloats=None, cover=None, flags=None, customizations=None, base_url='file://./', - latex_dir=False): + latex_dir=False, fundraising=None): """ produces a PDF file with XeLaTeX wldoc: a WLDocument @@ -305,6 +328,8 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None, root.set('thanks', document.book_info.thanks) # hack the tree + if fundraising: + add_fundraising(document.edoc, fundraising) move_motifs_inside(document.edoc) hack_motifs(document.edoc) parse_creator(document.edoc) diff --git a/src/librarian/pdf/wl.cls b/src/librarian/pdf/wl.cls index aa6abc2..d2eac63 100644 --- a/src/librarian/pdf/wl.cls +++ b/src/librarian/pdf/wl.cls @@ -722,6 +722,7 @@ Letters={Uppercase} \par{\emph{#1}}% } +\usepackage{framed} \usepackage{intcalc} \usepackage{color} \definecolor{gray}{RGB}{200,200,200} diff --git a/src/librarian/pdf/wl2tex.xslt b/src/librarian/pdf/wl2tex.xslt index bb61d10..ab189e0 100644 --- a/src/librarian/pdf/wl2tex.xslt +++ b/src/librarian/pdf/wl2tex.xslt @@ -678,4 +678,39 @@ + + + + + empty + + + + 2em + + + + 2em + + + + + + + + \\ + + + + + + + \href{}{} + + + + + + +     -- 2.20.1 From ac9ba215113d29655e142f23ab398c5c2765df1e Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 10 Apr 2024 13:12:30 +0200 Subject: [PATCH 15/16] rel --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a93be3..171bb9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ This document records all notable changes to Librarian. +## 24.4 + +- Add fundraising inserts in PDF. + +## 24.1 + +- Added cover logos support. + ## 23.12 - Added debug version for epub and epubcheck utility. diff --git a/setup.py b/setup.py index 6b04c15..1368375 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='24.1', + version='24.4', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', -- 2.20.1 From 4b0833f222da430d31356b6f065e56073b849d0f Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 10 Apr 2024 13:31:22 +0200 Subject: [PATCH 16/16] bugfix --- setup.py | 2 +- src/librarian/pdf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1368375..a11c86e 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='24.4', + version='24.4.1', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com', diff --git a/src/librarian/pdf.py b/src/librarian/pdf.py index e5cf5bd..de09755 100644 --- a/src/librarian/pdf.py +++ b/src/librarian/pdf.py @@ -196,7 +196,7 @@ def add_fundraising(doc, fundraising): naglowek.addprevious(spot) spots.append(spot) spot = etree.Element('f_spot') - doc.getroot()[-1][-1].append(spot) + doc.getroot()[-1].append(spot) spots.append(spot) e = len(spots) nfunds = len(fundraising) -- 2.20.1