Merged in moyogo/defconqt/ufowithanchors (pull request #2)

UFO with anchors

28 files changed, 273 insertions, 127 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-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 @@
     <key>note</key>
     <string></string>
     <key>openTypeHeadCreated</key>
-    <string>2011/07/29 15:44:58</string>
+    <string>2015/10/09 05:54:14</string>
     <key>openTypeHheaAscender</key>
     <integer>1920</integer>
     <key>openTypeHheaDescender</key>
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
@@ -4,6 +4,9 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
+      <point x="722" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="4" y="0" type="line"/>
       <point x="4" y="116" type="line"/>
       <point x="141" y="152" type="line"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="Acircumflex" format="1">
+  <advance width="1554"/>
+  <unicode hex="00C2"/>
+  <outline>
+    <component base="circumflexcomb.cap" xOffset="722"/>
+    <component base="A"/>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb.cap" format="1">
+  <advance width="0"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-293" y="1624" type="line"/>
+      <point x="-2" y="1815" type="line"/>
+      <point x="287" y="1624" type="line"/>
+      <point x="399" y="1712" type="line"/>
+      <point x="99" y="2008" type="line"/>
+      <point x="-103" y="2008" type="line"/>
+      <point x="-402" y="1711" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb" format="1">
+  <advance width="0"/>
+  <unicode hex="0302"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-298" y="1304" type="line"/>
+      <point x="1" y="1559" type="line"/>
+      <point x="291" y="1305" type="line"/>
+      <point x="403" y="1393" type="line"/>
+      <point x="97" y="1792" type="line"/>
+      <point x="-98" y="1792" type="line"/>
+      <point x="-404" y="1392" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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..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
@@ -4,6 +4,8 @@
   <dict>
     <key>numbersign</key>
     <string>numbersign.glif</string>
+    <key>percent</key>
+    <string>percent.glif</string>
     <key>period</key>
     <string>period.glif</string>
     <key>slash</key>
@@ -44,7 +46,13 @@
     <string>p.glif</string>
     <key>x</key>
     <string>x.glif</string>
-    <key>percent</key>
-    <string>percent.glif</string>
+    <key>circumflexcomb</key>
+    <string>circumflexcomb.glif</string>
+    <key>circumflexcomb.cap</key>
+    <string>circumflexcomb.cap.glif</string>
+    <key>Acircumflex</key>
+    <string>A_circumflex.glif</string>
+    <key>ocircumflex</key>
+    <string>ocircumflex.glif</string>
   </dict>
 </plist>
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
@@ -4,6 +4,9 @@
   <unicode hex="006F"/>
   <outline>
     <contour>
+      <point x="621" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="86" y="570" type="curve" smooth="yes"/>
       <point x="91" y="958"/>
       <point x="364" y="1148"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ocircumflex" format="1">
+  <advance width="1290"/>
+  <unicode hex="00F4"/>
+  <outline>
+    <component base="circumflexcomb" xOffset="621"/>
+    <component base="o"/>
+  </outline>
+</glyph>
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..a63553b 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,10 @@
 
 
-@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 ];
+@GDEF_Mark = [\circumflexcomb \circumflexcomb.cap ];
 
 table GDEF {
-  GlyphClassDef @GDEF_Simple, @GDEF_Ligature, , ;
+  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 @@
     <key>note</key>
     <string></string>
     <key>openTypeHeadCreated</key>
-    <string>2011/07/29 15:37:46</string>
+    <string>2015/10/09 06:28:00</string>
     <key>openTypeHheaAscender</key>
     <integer>1920</integer>
     <key>openTypeHheaDescender</key>
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
@@ -4,6 +4,9 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
+      <point x="703" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="2" y="0" type="line"/>
       <point x="2" y="67" type="line"/>
       <point x="148" y="91" type="line"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="Acircumflex" format="1">
+  <advance width="1493"/>
+  <unicode hex="00C2"/>
+  <outline>
+    <component base="circumflexcomb.cap" xOffset="703"/>
+    <component base="A"/>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb.cap" format="1">
+  <advance width="0"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-273" y="1673" type="line"/>
+      <point x="-1" y="1890" type="line"/>
+      <point x="265" y="1673" type="line"/>
+      <point x="340" y="1718" type="line"/>
+      <point x="75" y="2014" type="line"/>
+      <point x="-79" y="2014" type="line"/>
+      <point x="-341" y="1716" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb" format="1">
+  <advance width="0"/>
+  <unicode hex="0302"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-297" y="1333" type="line"/>
+      <point x="-1" y="1643" type="line"/>
+      <point x="280" y="1334" type="line"/>
+      <point x="353" y="1376" type="line"/>
+      <point x="77" y="1776" type="line"/>
+      <point x="-78" y="1776" type="line"/>
+      <point x="-362" y="1375" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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..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
@@ -36,6 +36,8 @@
     <string>A_.glif</string>
     <key>O</key>
     <string>O_.glif</string>
+    <key>e</key>
+    <string>e.glif</string>
     <key>n</key>
     <string>n.glif</string>
     <key>o</key>
@@ -44,5 +46,13 @@
     <string>p.glif</string>
     <key>x</key>
     <string>x.glif</string>
+    <key>circumflexcomb</key>
+    <string>circumflexcomb.glif</string>
+    <key>circumflexcomb.cap</key>
+    <string>circumflexcomb.cap.glif</string>
+    <key>Acircumflex</key>
+    <string>A_circumflex.glif</string>
+    <key>ocircumflex</key>
+    <string>ocircumflex.glif</string>
   </dict>
 </plist>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="e" format="1">
+  <advance width="1105"/>
+  <unicode hex="0065"/>
+  <outline>
+    <contour>
+      <point x="594" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
+      <point x="590" y="-23" type="curve" smooth="yes"/>
+      <point x="747" y="-23"/>
+      <point x="913" y="43"/>
+      <point x="991" y="123" type="curve"/>
+      <point x="958" y="198" type="line"/>
+      <point x="894" y="144"/>
+      <point x="760" y="94"/>
+      <point x="643" y="94" type="curve" smooth="yes"/>
+      <point x="446" y="94"/>
+      <point x="283" y="240"/>
+      <point x="274" y="557" type="curve" smooth="yes"/>
+      <point x="262" y="936"/>
+      <point x="395" y="1062"/>
+      <point x="579" y="1062" type="curve" smooth="yes"/>
+      <point x="761" y="1062"/>
+      <point x="834" y="936"/>
+      <point x="835" y="769" type="curve" smooth="yes"/>
+      <point x="835" y="739"/>
+      <point x="833" y="707"/>
+      <point x="830" y="678" type="curve"/>
+      <point x="211" y="678" type="line"/>
+      <point x="193" y="582" type="line"/>
+      <point x="1002" y="582" type="line"/>
+      <point x="1012" y="627"/>
+      <point x="1014" y="684"/>
+      <point x="1013" y="762" type="curve"/>
+      <point x="1004" y="1027"/>
+      <point x="862" y="1168"/>
+      <point x="621" y="1168" type="curve" smooth="yes"/>
+      <point x="320" y="1168"/>
+      <point x="96" y="925"/>
+      <point x="96" y="574" type="curve" smooth="yes"/>
+      <point x="96" y="224"/>
+      <point x="266" y="-23"/>
+    </contour>
+  </outline>
+</glyph>
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
@@ -4,6 +4,9 @@
   <unicode hex="006F"/>
   <outline>
     <contour>
+      <point x="617" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="104" y="581" type="curve" smooth="yes"/>
       <point x="109" y="934"/>
       <point x="353" y="1149"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ocircumflex" format="1">
+  <advance width="1231"/>
+  <unicode hex="00F4"/>
+  <outline>
+    <component base="circumflexcomb" xOffset="617"/>
+    <component base="o"/>
+  </outline>
+</glyph>
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..a63553b 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,10 @@
 
 
-@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 ];
+@GDEF_Mark = [\circumflexcomb \circumflexcomb.cap ];
 
 table GDEF {
-  GlyphClassDef @GDEF_Simple, @GDEF_Ligature, , ;
+  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 @@
     <key>note</key>
     <string></string>
     <key>openTypeHeadCreated</key>
-    <string>2011/07/29 15:46:25</string>
+    <string>2015/10/09 05:37:28</string>
     <key>openTypeHheaAscender</key>
     <integer>1920</integer>
     <key>openTypeHheaDescender</key>
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
@@ -4,6 +4,9 @@
   <unicode hex="0041"/>
   <outline>
     <contour>
+      <point x="713" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="2" y="0" type="line"/>
       <point x="2" y="85" type="line"/>
       <point x="145" y="114" type="line"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="Acircumflex" format="1">
+  <advance width="1493"/>
+  <unicode hex="00C2"/>
+  <outline>
+    <component base="circumflexcomb.cap" xOffset="713"/>
+    <component base="A"/>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb.cap" format="1">
+  <advance width="0"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-279" y="1654" type="line"/>
+      <point x="-1" y="1856" type="line"/>
+      <point x="272" y="1654" type="line"/>
+      <point x="364" y="1715" type="line"/>
+      <point x="90" y="2013" type="line"/>
+      <point x="-93" y="2013" type="line"/>
+      <point x="-364" y="1713" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="circumflexcomb" format="1">
+  <advance width="0"/>
+  <unicode hex="0302"/>
+  <outline>
+    <contour>
+      <point x="0" y="1700" type="move" name="_top"/>
+    </contour>
+    <contour>
+      <point x="-296" y="1324" type="line"/>
+      <point x="0" y="1606" type="line"/>
+      <point x="281" y="1325" type="line"/>
+      <point x="371" y="1383" type="line"/>
+      <point x="90" y="1781" type="line"/>
+      <point x="-90" y="1781" type="line"/>
+      <point x="-378" y="1382" type="line"/>
+    </contour>
+  </outline>
+</glyph>
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..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
@@ -4,6 +4,8 @@
   <dict>
     <key>numbersign</key>
     <string>numbersign.glif</string>
+    <key>percent</key>
+    <string>percent.glif</string>
     <key>period</key>
     <string>period.glif</string>
     <key>slash</key>
@@ -44,7 +46,13 @@
     <string>p.glif</string>
     <key>x</key>
     <string>x.glif</string>
-    <key>percent</key>
-    <string>percent.glif</string>
+    <key>circumflexcomb</key>
+    <string>circumflexcomb.glif</string>
+    <key>circumflexcomb.cap</key>
+    <string>circumflexcomb.cap.glif</string>
+    <key>Acircumflex</key>
+    <string>A_circumflex.glif</string>
+    <key>ocircumflex</key>
+    <string>ocircumflex.glif</string>
   </dict>
 </plist>
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
@@ -4,6 +4,9 @@
   <unicode hex="006F"/>
   <outline>
     <contour>
+      <point x="615" y="1700" type="move" name="top"/>
+    </contour>
+    <contour>
       <point x="101" y="582" type="curve" smooth="yes"/>
       <point x="106" y="940"/>
       <point x="356" y="1149"/>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ocircumflex" format="1">
+  <advance width="1231"/>
+  <unicode hex="00F4"/>
+  <outline>
+    <component base="circumflexcomb" xOffset="615"/>
+    <component base="o"/>
+  </outline>
+</glyph>