From 7cc0ec1d43b93bb3d3cc3c375483c9adb41e98bf Mon Sep 17 00:00:00 2001 From: Denis Jacquerye Date: Fri, 9 Oct 2015 07:35:10 +0100 Subject: share/fonts: Add e to Merriweather-Light-Subset since it’s in Regular and Bold --- .../glyphs/contents.plist | 2 + .../glyphs/e.glif | 46 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/e.glif diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist index 4702852..cc7b102 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist @@ -36,6 +36,8 @@ A_.glif O O_.glif + e + e.glif n n.glif o diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/e.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/e.glif new file mode 100644 index 0000000..9995b74 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/e.glif @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From dd8bc7e49174afac7b5424121fd1d78615e770ba Mon Sep 17 00:00:00 2001 From: Denis Jacquerye Date: Fri, 9 Oct 2015 07:38:50 +0100 Subject: share/fonts: Set order of percent in Merriweather-Regular-Subset and Bold as in Light --- .../subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist | 4 ++-- .../subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist index f8e27f7..cc7b102 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist @@ -4,6 +4,8 @@ numbersign numbersign.glif + percent + percent.glif period period.glif slash @@ -44,7 +46,5 @@ p.glif x x.glif - percent - percent.glif diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist index f8e27f7..cc7b102 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist @@ -4,6 +4,8 @@ numbersign numbersign.glif + percent + percent.glif period period.glif slash @@ -44,7 +46,5 @@ p.glif x x.glif - percent - percent.glif -- cgit v1.2.3 From c5f6965348aad0d12f16fb5f45ebad1b15b80ab0 Mon Sep 17 00:00:00 2001 From: Denis Jacquerye Date: Fri, 9 Oct 2015 07:48:39 +0100 Subject: share/fonts: Remove missing glyphs from Merriweather subsets’ features.fea --- .../Merriweather-Bold-Subset-nop.ufo/features.fea | 43 ++-------------------- .../Merriweather-Light-Subset-nop.ufo/features.fea | 43 ++-------------------- .../features.fea | 43 ++-------------------- 3 files changed, 9 insertions(+), 120 deletions(-) diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/features.fea b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/features.fea index 8eaaa32..da919cd 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/features.fea +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/features.fea @@ -1,46 +1,9 @@ -@GDEF_Simple = [\.null \CR \space \numbersign \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 \exclamdown \sterling \currency \brokenbar \dieresis \copyright - \guillemotleft \guilsinglleft \registered \macron \degree \plusminus \acute - \paragraph \periodcentered \cedilla \guillemotright \questiondown \multiply - \germandbls \eth \endash \emdash \quoteleft \quoteright \quotesinglbase - \quotedblleft \quotedblright \quotedblbase \dagger \bullet \guilsinglright - \quotedbl \exclam \logicalnot \yen \divide \daggerdbl \uni200A \uni2009 \uni2008 - \uni2007 \uni2006 \uni2005 \uni2004 \uni2003 \uni2000 \uni2001 \cent \uni2002 - \circumflex \caron \breve \dotaccent \ring \tilde \hungarumlaut \ogonek \onehalf - \onesuperior \twosuperior \onequarter \threequarters \threesuperior - \grave.cap \dieresis.cap \commabelow \commaaccent \circumflex.cap \caron.cap - \breve.cap \ring.cap \ogonek.cap \tilde.cap \hungarumlaut.cap \percent - \foundryicon \dotlessi \oslash \aogonek \Thorn \ordfeminine \ordmasculine - \section \acute.cap \AE \dollar \Oslash \Lslash \Euro \ae \mu \eogonek \thorn - \lslash \dotlessj \oe \kgreenlandic \ldot \OE \uni0001 \uni0002 \uni0003 \uni0019 - \uni0018 \uni0017 \uni0016 \uni0015 \uni0014 \uni0013 \uni0012 \uni0011 \uni0010 - \uni0009 \uni0008 \uni0007 \uni0006 \uni0005 \uni0004 \hbar \Ldotaccent - \trademark \perthousand \ellipsis \Eth \kcommaaccent \florin \approxequal - \Delta \lessequal \greaterequal \notequal \fraction \lozenge \Omega \radical - \summation \integral \pi \product \partialdiff \infinity \HT \LF \uni000A - \uni000B \uni000C \uni000D \uni000E \uni000F \uni0000 \uni001A \uni001B \uni001C - \uni001D \uni001E \uni001F \uni007F \DLE \DC1 \DC2 \DC3 \DC4 \minus \RS \US \DEL - \nbspace \dotaccent.cap \Zacute \Zdotaccent \Zcaron \Agrave \Aacute - \Acircumflex \Adieresis \Aring \ugrave \uacute \ucircumflex \udieresis \agrave - \aacute \acircumflex \adieresis \atilde \aring \egrave \eacute \ecircumflex - \edieresis \zcaron \zdotaccent \yacute \ydieresis \ograve \oacute \ocircumflex - \otilde \odieresis \IJ \Igrave \Iacute \Itilde \Icircumflex \Idieresis \Ugrave - \Uacute \Ucircumflex \Udieresis \Yacute \Ydieresis \Nacute \Ntilde \Atilde - \Egrave \Eacute \Ecircumflex \Edieresis \Racute \Rcaron \Rcommaaccent \Ograve - \Oacute \Ocircumflex \Otilde \Odieresis \Kcommaaccent \rcaron \rcommaaccent - \scaron \ij \jcircumflex \Jcircumflex \Eogonek \Scaron \Ccedilla \ccedilla - \nacute \ntilde \igrave \itilde \idieresis \iacute \icircumflex \Aogonek ]; -@GDEF_Ligature = [\ff \fi \ffi \fl \ffl ]; +@GDEF_Simple = [\numbersign \percent \period \slash \zero \one \two \three \four + \five \six \seven \eight \nine \colon \A \O \e \n \o \p \x \Acircumflex \ocircumflex ]; table GDEF { - GlyphClassDef @GDEF_Simple, @GDEF_Ligature, , ; + GlyphClassDef @GDEF_Simple, , , ; } GDEF; - diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea index de32fb8..da919cd 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea @@ -1,46 +1,9 @@ -@GDEF_Simple = [\space \exclam \quotedbl \numbersign \dollar \percent \ampersand - \quoteright \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 - \quoteleft \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 \exclamdown \cent \sterling \fraction \yen \florin - \section \currency \quotesingle \quotedblleft \guillemotleft \guilsinglleft - \guilsinglright \endash \dagger \daggerdbl \periodcentered \paragraph \bullet - \quotesinglbase \quotedblbase \quotedblright \guillemotright \ellipsis - \perthousand \questiondown \grave \acute \circumflex \tilde \macron \breve - \dotaccent \dieresis \ring \cedilla \hungarumlaut \ogonek \caron \emdash \AE - \ordfeminine \Lslash \Oslash \OE \ordmasculine \ae \dotlessi \lslash \oslash \oe - \germandbls \onesuperior \logicalnot \mu \trademark \Eth \onehalf \plusminus - \Thorn \onequarter \divide \brokenbar \degree \thorn \threequarters - \twosuperior \registered \minus \eth \multiply \threesuperior \copyright - \Aacute \Acircumflex \Adieresis \Agrave \Aring \Atilde \Ccedilla \Eacute - \Ecircumflex \Edieresis \Egrave \Iacute \Icircumflex \Idieresis \Igrave \Ntilde - \Oacute \Ocircumflex \Odieresis \Ograve \Otilde \Scaron \Uacute \Ucircumflex - \Udieresis \Ugrave \Yacute \Ydieresis \Zcaron \aacute \acircumflex \adieresis - \agrave \aring \atilde \ccedilla \eacute \ecircumflex \edieresis \egrave \iacute - \icircumflex \idieresis \igrave \ntilde \oacute \ocircumflex \odieresis \ograve - \otilde \scaron \uacute \ucircumflex \udieresis \ugrave \yacute \ydieresis - \zcaron \.null \CR \uni200A \uni2009 \uni2008 \uni2007 \uni2006 \uni2005 \uni2004 - \uni2003 \uni2000 \uni2001 \uni2002 \grave.cap \dieresis.cap \commabelow - \commaaccent \circumflex.cap \caron.cap \breve.cap \ring.cap \ogonek.cap - \tilde.cap \foundryicon \aogonek \acute.cap \Euro \eogonek \dotlessj - \kgreenlandic \ldot \uni0001 \uni0002 \uni0003 \uni0019 \uni0018 \uni0017 - \uni0016 \uni0015 \uni0014 \uni0013 \uni0012 \uni0011 \uni0010 \uni0009 \uni0008 - \uni0007 \uni0006 \uni0005 \uni0004 \hbar \Ldotaccent \kcommaaccent - \approxequal \Delta \lessequal \greaterequal \notequal \lozenge \Omega \radical - \summation \integral \pi \product \partialdiff \infinity \HT \LF \uni000A - \uni000B \uni000C \uni000D \uni000E \uni000F \uni0000 \uni001A \uni001B \uni001C - \uni001D \uni001E \uni001F \uni007F \DLE \DC1 \DC2 \DC3 \DC4 \RS \US \DEL \nbspace - \dotaccent.cap \Zacute \Zdotaccent \zdotaccent \IJ \Itilde \Nacute \Racute - \Rcaron \Rcommaaccent \Kcommaaccent \rcaron \rcommaaccent \ij \jcircumflex - \Jcircumflex \Eogonek \nacute \itilde \Aogonek ]; -@GDEF_Ligature = [\fi \fl \ff \ffi \ffl ]; +@GDEF_Simple = [\numbersign \percent \period \slash \zero \one \two \three \four + \five \six \seven \eight \nine \colon \A \O \e \n \o \p \x \Acircumflex \ocircumflex ]; table GDEF { - GlyphClassDef @GDEF_Simple, @GDEF_Ligature, , ; + GlyphClassDef @GDEF_Simple, , , ; } GDEF; - diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea index 8eaaa32..da919cd 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea @@ -1,46 +1,9 @@ -@GDEF_Simple = [\.null \CR \space \numbersign \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 \exclamdown \sterling \currency \brokenbar \dieresis \copyright - \guillemotleft \guilsinglleft \registered \macron \degree \plusminus \acute - \paragraph \periodcentered \cedilla \guillemotright \questiondown \multiply - \germandbls \eth \endash \emdash \quoteleft \quoteright \quotesinglbase - \quotedblleft \quotedblright \quotedblbase \dagger \bullet \guilsinglright - \quotedbl \exclam \logicalnot \yen \divide \daggerdbl \uni200A \uni2009 \uni2008 - \uni2007 \uni2006 \uni2005 \uni2004 \uni2003 \uni2000 \uni2001 \cent \uni2002 - \circumflex \caron \breve \dotaccent \ring \tilde \hungarumlaut \ogonek \onehalf - \onesuperior \twosuperior \onequarter \threequarters \threesuperior - \grave.cap \dieresis.cap \commabelow \commaaccent \circumflex.cap \caron.cap - \breve.cap \ring.cap \ogonek.cap \tilde.cap \hungarumlaut.cap \percent - \foundryicon \dotlessi \oslash \aogonek \Thorn \ordfeminine \ordmasculine - \section \acute.cap \AE \dollar \Oslash \Lslash \Euro \ae \mu \eogonek \thorn - \lslash \dotlessj \oe \kgreenlandic \ldot \OE \uni0001 \uni0002 \uni0003 \uni0019 - \uni0018 \uni0017 \uni0016 \uni0015 \uni0014 \uni0013 \uni0012 \uni0011 \uni0010 - \uni0009 \uni0008 \uni0007 \uni0006 \uni0005 \uni0004 \hbar \Ldotaccent - \trademark \perthousand \ellipsis \Eth \kcommaaccent \florin \approxequal - \Delta \lessequal \greaterequal \notequal \fraction \lozenge \Omega \radical - \summation \integral \pi \product \partialdiff \infinity \HT \LF \uni000A - \uni000B \uni000C \uni000D \uni000E \uni000F \uni0000 \uni001A \uni001B \uni001C - \uni001D \uni001E \uni001F \uni007F \DLE \DC1 \DC2 \DC3 \DC4 \minus \RS \US \DEL - \nbspace \dotaccent.cap \Zacute \Zdotaccent \Zcaron \Agrave \Aacute - \Acircumflex \Adieresis \Aring \ugrave \uacute \ucircumflex \udieresis \agrave - \aacute \acircumflex \adieresis \atilde \aring \egrave \eacute \ecircumflex - \edieresis \zcaron \zdotaccent \yacute \ydieresis \ograve \oacute \ocircumflex - \otilde \odieresis \IJ \Igrave \Iacute \Itilde \Icircumflex \Idieresis \Ugrave - \Uacute \Ucircumflex \Udieresis \Yacute \Ydieresis \Nacute \Ntilde \Atilde - \Egrave \Eacute \Ecircumflex \Edieresis \Racute \Rcaron \Rcommaaccent \Ograve - \Oacute \Ocircumflex \Otilde \Odieresis \Kcommaaccent \rcaron \rcommaaccent - \scaron \ij \jcircumflex \Jcircumflex \Eogonek \Scaron \Ccedilla \ccedilla - \nacute \ntilde \igrave \itilde \idieresis \iacute \icircumflex \Aogonek ]; -@GDEF_Ligature = [\ff \fi \ffi \fl \ffl ]; +@GDEF_Simple = [\numbersign \percent \period \slash \zero \one \two \three \four + \five \six \seven \eight \nine \colon \A \O \e \n \o \p \x \Acircumflex \ocircumflex ]; table GDEF { - GlyphClassDef @GDEF_Simple, @GDEF_Ligature, , ; + GlyphClassDef @GDEF_Simple, , , ; } GDEF; - -- cgit v1.2.3 From 1c8db85672a343a3d998db24d3d62cc8a9996116 Mon Sep 17 00:00:00 2001 From: Denis Jacquerye Date: Fri, 9 Oct 2015 07:53:25 +0100 Subject: share/fonts: Add circumflexcomb, circumflexcomb.cap, Acircumflex, ocircumflex to Merriweather subsets --- .../Merriweather-Bold-Subset-nop.ufo/fontinfo.plist | 2 +- .../Merriweather-Bold-Subset-nop.ufo/glyphs/A_.glif | 3 +++ .../glyphs/A_circumflex.glif | 9 +++++++++ .../glyphs/circumflexcomb.cap.glif | 18 ++++++++++++++++++ .../glyphs/circumflexcomb.glif | 19 +++++++++++++++++++ .../glyphs/contents.plist | 8 ++++++++ .../Merriweather-Bold-Subset-nop.ufo/glyphs/o.glif | 3 +++ .../glyphs/ocircumflex.glif | 9 +++++++++ .../Merriweather-Light-Subset-nop.ufo/features.fea | 3 ++- .../Merriweather-Light-Subset-nop.ufo/fontinfo.plist | 2 +- .../Merriweather-Light-Subset-nop.ufo/glyphs/A_.glif | 3 +++ .../glyphs/A_circumflex.glif | 9 +++++++++ .../glyphs/circumflexcomb.cap.glif | 18 ++++++++++++++++++ .../glyphs/circumflexcomb.glif | 19 +++++++++++++++++++ .../glyphs/contents.plist | 8 ++++++++ .../Merriweather-Light-Subset-nop.ufo/glyphs/o.glif | 3 +++ .../glyphs/ocircumflex.glif | 9 +++++++++ .../Merriweather-Regular-Subset-nop.ufo/features.fea | 3 ++- .../fontinfo.plist | 2 +- .../glyphs/A_.glif | 3 +++ .../glyphs/A_circumflex.glif | 9 +++++++++ .../glyphs/circumflexcomb.cap.glif | 18 ++++++++++++++++++ .../glyphs/circumflexcomb.glif | 19 +++++++++++++++++++ .../glyphs/contents.plist | 8 ++++++++ .../Merriweather-Regular-Subset-nop.ufo/glyphs/o.glif | 3 +++ .../glyphs/ocircumflex.glif | 9 +++++++++ 26 files changed, 214 insertions(+), 5 deletions(-) create mode 100644 share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_circumflex.glif create mode 100644 share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif create mode 100644 share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.glif create mode 100644 share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/ocircumflex.glif create mode 100644 share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_circumflex.glif create mode 100644 share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif create mode 100644 share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.glif create mode 100644 share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/ocircumflex.glif create mode 100644 share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_circumflex.glif create mode 100644 share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif create mode 100644 share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.glif create mode 100644 share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/ocircumflex.glif diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/fontinfo.plist b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/fontinfo.plist index c8926e4..6313126 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/fontinfo.plist +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/fontinfo.plist @@ -25,7 +25,7 @@ note openTypeHeadCreated - 2011/07/29 15:44:58 + 2015/10/09 05:54:14 openTypeHheaAscender 1920 openTypeHheaDescender diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_.glif index 177165c..bf0da5e 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_.glif +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_circumflex.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_circumflex.glif new file mode 100644 index 0000000..9df7fa9 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/A_circumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif new file mode 100644 index 0000000..de50174 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.glif new file mode 100644 index 0000000..038ef2b --- /dev/null +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/circumflexcomb.glif @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist index cc7b102..2f7b894 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/contents.plist @@ -46,5 +46,13 @@ p.glif x x.glif + circumflexcomb + circumflexcomb.glif + circumflexcomb.cap + circumflexcomb.cap.glif + Acircumflex + A_circumflex.glif + ocircumflex + ocircumflex.glif diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/o.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/o.glif index e6efef4..da469d5 100644 --- a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/o.glif +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/o.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/ocircumflex.glif b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/ocircumflex.glif new file mode 100644 index 0000000..f20d866 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Bold-Subset-nop.ufo/glyphs/ocircumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea index da919cd..a63553b 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/features.fea @@ -2,8 +2,9 @@ @GDEF_Simple = [\numbersign \percent \period \slash \zero \one \two \three \four \five \six \seven \eight \nine \colon \A \O \e \n \o \p \x \Acircumflex \ocircumflex ]; +@GDEF_Mark = [\circumflexcomb \circumflexcomb.cap ]; table GDEF { - GlyphClassDef @GDEF_Simple, , , ; + GlyphClassDef @GDEF_Simple, , @GDEF_Mark, ; } GDEF; diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/fontinfo.plist b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/fontinfo.plist index 2fc8a58..b7088ff 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/fontinfo.plist +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/fontinfo.plist @@ -25,7 +25,7 @@ note openTypeHeadCreated - 2011/07/29 15:37:46 + 2015/10/09 06:28:00 openTypeHheaAscender 1920 openTypeHheaDescender diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_.glif index 334b08a..39b363c 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_.glif +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_circumflex.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_circumflex.glif new file mode 100644 index 0000000..6ffbb4b --- /dev/null +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/A_circumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif new file mode 100644 index 0000000..9b43156 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.glif new file mode 100644 index 0000000..09fd071 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/circumflexcomb.glif @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist index cc7b102..2f7b894 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/contents.plist @@ -46,5 +46,13 @@ p.glif x x.glif + circumflexcomb + circumflexcomb.glif + circumflexcomb.cap + circumflexcomb.cap.glif + Acircumflex + A_circumflex.glif + ocircumflex + ocircumflex.glif diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/o.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/o.glif index f867b53..7f35866 100644 --- a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/o.glif +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/o.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/ocircumflex.glif b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/ocircumflex.glif new file mode 100644 index 0000000..6f0b8a3 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Light-Subset-nop.ufo/glyphs/ocircumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea index da919cd..a63553b 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/features.fea @@ -2,8 +2,9 @@ @GDEF_Simple = [\numbersign \percent \period \slash \zero \one \two \three \four \five \six \seven \eight \nine \colon \A \O \e \n \o \p \x \Acircumflex \ocircumflex ]; +@GDEF_Mark = [\circumflexcomb \circumflexcomb.cap ]; table GDEF { - GlyphClassDef @GDEF_Simple, , , ; + GlyphClassDef @GDEF_Simple, , @GDEF_Mark, ; } GDEF; diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/fontinfo.plist b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/fontinfo.plist index fdbe811..ec93caa 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/fontinfo.plist +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/fontinfo.plist @@ -25,7 +25,7 @@ note openTypeHeadCreated - 2011/07/29 15:46:25 + 2015/10/09 05:37:28 openTypeHheaAscender 1920 openTypeHheaDescender diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_.glif index 5dbbc39..bb5ad2f 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_.glif +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_circumflex.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_circumflex.glif new file mode 100644 index 0000000..80a98a1 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/A_circumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif new file mode 100644 index 0000000..3fbd581 --- /dev/null +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.cap.glif @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.glif new file mode 100644 index 0000000..e0050ea --- /dev/null +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/circumflexcomb.glif @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist index cc7b102..2f7b894 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/contents.plist @@ -46,5 +46,13 @@ p.glif x x.glif + circumflexcomb + circumflexcomb.glif + circumflexcomb.cap + circumflexcomb.cap.glif + Acircumflex + A_circumflex.glif + ocircumflex + ocircumflex.glif diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/o.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/o.glif index 1578aa5..d50d82c 100644 --- a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/o.glif +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/o.glif @@ -3,6 +3,9 @@ + + + diff --git a/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/ocircumflex.glif b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/ocircumflex.glif new file mode 100644 index 0000000..7344c8d --- /dev/null +++ b/share/fonts/subsets/Merriweather-Regular-Subset-nop.ufo/glyphs/ocircumflex.glif @@ -0,0 +1,9 @@ + + + + + + + + + -- cgit v1.2.3