Merge remote-tracking branch 'remotes/origin/abnt-gaps-java'

CMakeLists.txt

@@ -28,6 +28,7 @@ find_package (GDKPixBuf REQUIRED)
 find_package (GDK3 REQUIRED)
 
 find_package (Cairo REQUIRED)
+find_package (Fontconfig REQUIRED)
 find_package (Pango REQUIRED)
 find_package (RSVG REQUIRED)
 find_package (GStreamer 1.0 REQUIRED)
@@ -166,6 +167,7 @@ set (LIBGINGA_INCLUDE_DIRS
   ${GDK3_INCLUDE_DIRS}
 
   ${CAIRO_INCLUDE_DIRS}
+  ${FONTCONFIG_INCLUDE_DIR}
   ${PANGO_INCLUDE_DIRS}
   ${RSVG_INCLUDE_DIRS}
   ${GSTREAMER_INCLUDE_DIRS}
@@ -188,6 +190,7 @@ set (LIBGINGA_LIBS
   ${GDKPIXBUF_LIBRARIES}
 
   ${CAIRO_LIBRARIES}
+  ${FONTCONFIG_LIBRARIES}
   ${PANGO_LIBRARIES}
   ${RSVG_LIBRARIES}
   ${GSTREAMER_LIBRARIES}

build-cmake/CMakeModules/FindFontconfig.cmake

@@ -0,0 +1,69 @@
+# - Try to find the  Fontconfig
+# Once done this will define
+#
+#  FONTCONFIG_FOUND - system has Fontconfig
+#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers
+#  FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
+#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
+
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+
+  # in cache already
+  set(FONTCONFIG_FOUND TRUE)
+
+else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_FONTCONFIG fontconfig)
+
+    set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
+    PATHS
+    ${PC_FONTCONFIG_INCLUDEDIR}
+    ${PC_FONTCONFIG_INCLUDE_DIRS}
+    /usr/X11/include
+  )
+
+  find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
+    PATHS
+    ${PC_FONTCONFIG_LIBDIR}
+    ${PC_FONTCONFIG_LIBRARY_DIRS}
+  )
+
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
+
+  mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
+
+endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)

lib/Parser.cpp

@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2018 PUC-Rio/Laboratorio TeleMidia
+      /* Copyright (C) 2006-2018 PUC-Rio/Laboratorio TeleMidia
 
 This file is part of Ginga (Ginga-NCL).
 
@@ -26,6 +26,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
+#include <fontconfig/fontconfig.h>
 #include <libxml/uri.h>
 
 GINGA_NAMESPACE_BEGIN
@@ -236,6 +237,8 @@ class ParserState
   static bool pushLinkParam (ParserState *, ParserElt *);
   static bool pushBind (ParserState *, ParserElt *);
 
+  static bool pushFont (ParserState *, ParserElt *);
+
 private:
   Document *_doc;      ///< The resulting #Document.
   xmlDoc *_xml;        ///< The DOM tree being processed.
@@ -692,13 +695,34 @@ static map<string, ParserSyntaxElt> parser_syntax_table = {
       { ParserState::pushImportBase,
         nullptr,
         ELT_CACHE,
-        { "connectorBase", "descriptorBase", "regionBase", "ruleBase",
-          "transitionBase" },
+        {"connectorBase", "descriptorBase", "regionBase", "ruleBase",
+          "transitionBase", "fontBase"},
         { { "alias", ATTR_REQUIRED_NONEMPTY_NAME },
           { "documentURI", ATTR_REQUIRED },
           { "region", 0 },     // unused
           { "baseId", 0 } } }, // unused
   },
+  {
+    "fontBase",
+    {
+      nullptr,
+      nullptr,
+      ELT_CACHE,
+      {"head"},
+      {} // no attributes
+    }
+  },
+  {
+    "font",
+    {ParserState::pushFont,
+      nullptr,
+      ELT_CACHE,
+      {"fontBase"},
+      { {"fontFamily", ATTR_REQUIRED},
+        {"src", ATTR_REQUIRED},
+        {"fontStyle", 0},
+        {"fontWeight", 0} } },
+  },
   {
       "body",
       { ParserState::pushContext, // reused
@@ -3916,6 +3940,15 @@ ParserState::pushMedia (ParserState *st, ParserElt *elt)
                 delete tmpMedia;
             }
 
+          gchar *scheme = g_uri_parse_scheme (src.c_str  ());
+          if (g_strcmp0 (scheme, "streambuf") == 0)
+            {
+              string filename = src.substr (12);
+              src = string ("file:/tmp/") + filename + ".mp4";
+            }
+          g_free (scheme);
+          // xmlFree (s);
+
           // add this Media as refer to MediaSettings
           parent = cast (Composition *, st->objStackPeek ());
           g_assert_nonnull (parent);
@@ -4150,6 +4183,77 @@ ParserState::pushBind (ParserState *st, ParserElt *elt)
   return true;
 }
 
+/**
+ * @brief Starts the processing of \<font\> element.
+ *
+ * This function parses \p elt and loads the font using fontconfig.
+ *
+ * @param st #ParserState
+ * @param elt Element wrapper.
+ * @return \c true if successful, or \c false otherwise.
+ */
+bool
+ParserState::pushFont (ParserState *st, ParserElt *elt)
+{
+  string family, src, style = "normal", weight = "normal";
+
+  g_assert (elt->getAttribute ("fontFamily", &family));
+  g_assert (elt->getAttribute ("src", &src));
+
+  elt->getAttribute ("fontStyle", &style);
+  elt->getAttribute ("fontWeight", &weight);
+
+  // fixme:  We should also handle remote URIs; g_file_move could help us.
+  if (st->getURI () != "")
+    {
+      xmlChar *s = xmlBuildURI (toXmlChar (src), toXmlChar (st->getURI()));
+      src = toCPPString (s);
+      xmlFree (s);
+      src = xpathfromuri (src.c_str ());
+    }
+  else
+    src = xpathmakeabs (src);
+
+  const FcChar8 *fcfilename = (const FcChar8 *) src.c_str();
+  FcBool fontAddStatus = FcConfigAppFontAddFile (NULL, fcfilename);
+
+  TRACE ("Adding font family='%s' src='%s' success: %d.",
+         family.c_str(), src.c_str(), fontAddStatus);
+
+  if (fontAddStatus == FcTrue)
+    {
+      //  Replaces font metadata with the specifications in the <font> elt.
+      FcFontSet *fontSet = FcConfigGetFonts (FcConfigGetCurrent(),
+                                             FcSetApplication);
+      FcPattern *font = fontSet->fonts[fontSet->nfont-1];
+
+      // family
+      const FcChar8 *fcfamily = (const FcChar8 *) family.c_str();
+      FcPatternRemove (font, FC_FAMILY, 0);
+      FcPatternAddString (font, FC_FAMILY, fcfamily);
+
+      FcPatternRemove (font, FC_FULLNAME, 0);
+      FcPatternAddString (font, FC_FULLNAME, fcfamily);
+
+      // style
+      FcPatternRemove (font, FC_STYLE, 0);
+      FcPatternAddString (font, FC_STYLE, (const FcChar8 *) style.c_str ());
+
+      // weight
+      FcPatternRemove (font, FC_WEIGHT, 0);
+      if (weight == "bold")
+        FcPatternAddInteger (font, FC_WEIGHT, FC_WEIGHT_BOLD);
+      else
+        FcPatternAddInteger (font, FC_WEIGHT, FC_WEIGHT_NORMAL);
+
+      FcPatternRemove (font, FC_POSTSCRIPT_NAME, 0);
+
+//      FcPatternPrint (new_font);
+    }
+
+  return (fontAddStatus == FcTrue);
+}
+
 // External API.
 
 /// Helper function used by Parser::parseBuffer() and Parser::parseFile().

tests-ncl/samples/MedievalSharp-SIL-Open-Font-License.txt

@@ -0,0 +1,106 @@
+Copyright (c) 2011, wmk69 (wmk69@o2.pl),
+with Reserved Font Names 'MedievalSharp', 'Medieval Sharp', 'Medieval Sharp Bold'
+'Medieval Sharp Bold Oblique', 'Medieval Sharp Oblique'.
+
+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.