update 1.0.8.0

Commits for version update

vendor/tijsverkoyen/css-to-inline-styles/LICENSE.md

@@ -0,0 +1,22 @@
+Copyright (c) Tijs Verkoyen. All rights reserved.
+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 above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above 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.

vendor/tijsverkoyen/css-to-inline-styles/composer.json

@@ -0,0 +1,31 @@
+{
+  "name":        "tijsverkoyen/css-to-inline-styles",
+  "type":        "library",
+  "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
+  "homepage":    "https://github.com/tijsverkoyen/CssToInlineStyles",
+  "license":     "BSD",
+  "authors":     [
+    {
+      "name":  "Tijs Verkoyen",
+      "email": "css_to_inline_styles@verkoyen.eu",
+      "role":  "Developer"
+    }
+  ],
+  "require":     {
+    "php":                  ">=5.3.0",
+    "symfony/css-selector": "~2.1|~3.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit":      "~4.0"
+  },
+  "autoload":    {
+    "psr-4": {
+      "TijsVerkoyen\\CssToInlineStyles\\": "src"
+    }
+  },
+  "extra":       {
+    "branch-alias": {
+      "dev-master": "1.5.x-dev"
+    }
+  }
+}

vendor/tijsverkoyen/css-to-inline-styles/src/CssToInlineStyles.php

@@ -0,0 +1,677 @@
+<?php
+namespace TijsVerkoyen\CssToInlineStyles;
+
+/**
+ * CSS to Inline Styles class
+ *
+ * @author         Tijs Verkoyen <php-css-to-inline-styles@verkoyen.eu>
+ * @version        1.5.5
+ * @copyright      Copyright (c), Tijs Verkoyen. All rights reserved.
+ * @license        Revised BSD License
+ */
+class CssToInlineStyles
+{
+    /**
+     * The CSS to use
+     *
+     * @var    string
+     */
+    private $css;
+
+    /**
+     * Should the generated HTML be cleaned
+     *
+     * @var    bool
+     */
+    private $cleanup = false;
+
+    /**
+     * The encoding to use.
+     *
+     * @var    string
+     */
+    private $encoding = 'UTF-8';
+
+    /**
+     * The HTML to process
+     *
+     * @var    string
+     */
+    private $html;
+
+    /**
+     * Use inline-styles block as CSS
+     *
+     * @var    bool
+     */
+    private $useInlineStylesBlock = false;
+
+    /**
+     * Strip original style tags
+     *
+     * @var bool
+     */
+    private $stripOriginalStyleTags = false;
+
+    /**
+     * Exclude the media queries from the inlined styles
+     *
+     * @var bool
+     */
+    private $excludeMediaQueries = true;
+
+    /**
+     * Creates an instance, you could set the HTML and CSS here, or load it
+     * later.
+     *
+     * @return void
+     * @param  string [optional] $html The HTML to process.
+     * @param  string [optional] $css  The CSS to use.
+     */
+    public function __construct($html = null, $css = null)
+    {
+        if ($html !== null) {
+            $this->setHTML($html);
+        }
+        if ($css !== null) {
+            $this->setCSS($css);
+        }
+    }
+
+    /**
+     * Remove id and class attributes.
+     *
+     * @return string
+     * @param  \DOMXPath $xPath The DOMXPath for the entire document.
+     */
+    private function cleanupHTML(\DOMXPath $xPath)
+    {
+        $nodes = $xPath->query('//@class | //@id');
+
+        foreach ($nodes as $node) {
+            $node->ownerElement->removeAttributeNode($node);
+        }
+    }
+
+    /**
+     * Converts the loaded HTML into an HTML-string with inline styles based on the loaded CSS
+     *
+     * @return string
+     * @param  bool [optional] $outputXHTML Should we output valid XHTML?
+     */
+    public function convert($outputXHTML = false)
+    {
+        // redefine
+        $outputXHTML = (bool) $outputXHTML;
+
+        // validate
+        if ($this->html == null) {
+            throw new Exception('No HTML provided.');
+        }
+
+        // should we use inline style-block
+        if ($this->useInlineStylesBlock) {
+            // init var
+            $matches = array();
+
+            // match the style blocks
+            preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
+
+            // any style-blocks found?
+            if (!empty($matches[2])) {
+                // add
+                foreach ($matches[2] as $match) {
+                    $this->css .= trim($match) . "\n";
+                }
+            }
+        }
+
+        // process css
+        $cssRules = $this->processCSS();
+
+        // create new DOMDocument
+        $document = new \DOMDocument('1.0', $this->getEncoding());
+
+        // set error level
+        $internalErrors = libxml_use_internal_errors(true);
+
+        // load HTML
+        $document->loadHTML($this->html);
+
+        // Restore error level
+        libxml_use_internal_errors($internalErrors);
+
+        // create new XPath
+        $xPath = new \DOMXPath($document);
+
+        // any rules?
+        if (!empty($cssRules)) {
+            // loop rules
+            foreach ($cssRules as $rule) {
+
+                $selector = new Selector($rule['selector']);
+                $query = $selector->toXPath();
+
+                if (is_null($query)) {
+                    continue;
+                }
+
+                // search elements
+                $elements = $xPath->query($query);
+
+                // validate elements
+                if ($elements === false) {
+                    continue;
+                }
+
+                // loop found elements
+                foreach ($elements as $element) {
+                    // no styles stored?
+                    if ($element->attributes->getNamedItem(
+                            'data-css-to-inline-styles-original-styles'
+                        ) == null
+                    ) {
+                        // init var
+                        $originalStyle = '';
+                        if ($element->attributes->getNamedItem('style') !== null) {
+                            $originalStyle = $element->attributes->getNamedItem('style')->value;
+                        }
+
+                        // store original styles
+                        $element->setAttribute(
+                            'data-css-to-inline-styles-original-styles',
+                            $originalStyle
+                        );
+
+                        // clear the styles
+                        $element->setAttribute('style', '');
+                    }
+
+                    // init var
+                    $properties = array();
+
+                    // get current styles
+                    $stylesAttribute = $element->attributes->getNamedItem('style');
+
+                    // any styles defined before?
+                    if ($stylesAttribute !== null) {
+                        // get value for the styles attribute
+                        $definedStyles = (string) $stylesAttribute->value;
+
+                        // split into properties
+                        $definedProperties = $this->splitIntoProperties($definedStyles);
+                        // loop properties
+                        foreach ($definedProperties as $property) {
+                            // validate property
+                            if ($property == '') {
+                                continue;
+                            }
+
+                            // split into chunks
+                            $chunks = (array) explode(':', trim($property), 2);
+
+                            // validate
+                            if (!isset($chunks[1])) {
+                                continue;
+                            }
+
+                            // loop chunks
+                            $properties[$chunks[0]] = trim($chunks[1]);
+                        }
+                    }
+
+                    // add new properties into the list
+                    foreach ($rule['properties'] as $key => $value) {
+                        // If one of the rules is already set and is !important, don't apply it,
+                        // except if the new rule is also important.
+                        if (
+                            !isset($properties[$key])
+                            || stristr($properties[$key], '!important') === false
+                            || (stristr(implode('', $value), '!important') !== false)
+                        ) {
+                            $properties[$key] = $value;
+                        }
+                    }
+
+                    // build string
+                    $propertyChunks = array();
+
+                    // build chunks
+                    foreach ($properties as $key => $values) {
+                        foreach ((array) $values as $value) {
+                            $propertyChunks[] = $key . ': ' . $value . ';';
+                        }
+                    }
+
+                    // build properties string
+                    $propertiesString = implode(' ', $propertyChunks);
+
+                    // set attribute
+                    if ($propertiesString != '') {
+                        $element->setAttribute('style', $propertiesString);
+                    }
+                }
+            }
+
+            // reapply original styles
+            // search elements
+            $elements = $xPath->query('//*[@data-css-to-inline-styles-original-styles]');
+
+            // loop found elements
+            foreach ($elements as $element) {
+                // get the original styles
+                $originalStyle = $element->attributes->getNamedItem(
+                    'data-css-to-inline-styles-original-styles'
+                )->value;
+
+                if ($originalStyle != '') {
+                    $originalProperties = array();
+                    $originalStyles = $this->splitIntoProperties($originalStyle);
+
+                    foreach ($originalStyles as $property) {
+                        // validate property
+                        if ($property == '') {
+                            continue;
+                        }
+
+                        // split into chunks
+                        $chunks = (array) explode(':', trim($property), 2);
+
+                        // validate
+                        if (!isset($chunks[1])) {
+                            continue;
+                        }
+
+                        // loop chunks
+                        $originalProperties[$chunks[0]] = trim($chunks[1]);
+                    }
+
+                    // get current styles
+                    $stylesAttribute = $element->attributes->getNamedItem('style');
+                    $properties = array();
+
+                    // any styles defined before?
+                    if ($stylesAttribute !== null) {
+                        // get value for the styles attribute
+                        $definedStyles = (string) $stylesAttribute->value;
+
+                        // split into properties
+                        $definedProperties = $this->splitIntoProperties($definedStyles);
+
+                        // loop properties
+                        foreach ($definedProperties as $property) {
+                            // validate property
+                            if ($property == '') {
+                                continue;
+                            }
+
+                            // split into chunks
+                            $chunks = (array) explode(':', trim($property), 2);
+
+                            // validate
+                            if (!isset($chunks[1])) {
+                                continue;
+                            }
+
+                            // loop chunks
+                            $properties[$chunks[0]] = trim($chunks[1]);
+                        }
+                    }
+
+                    // add new properties into the list
+                    foreach ($originalProperties as $key => $value) {
+                        $properties[$key] = $value;
+                    }
+
+                    // build string
+                    $propertyChunks = array();
+
+                    // build chunks
+                    foreach ($properties as $key => $values) {
+                        foreach ((array) $values as $value) {
+                            $propertyChunks[] = $key . ': ' . $value . ';';
+                        }
+                    }
+
+                    // build properties string
+                    $propertiesString = implode(' ', $propertyChunks);
+
+                    // set attribute
+                    if ($propertiesString != '') {
+                        $element->setAttribute(
+                            'style',
+                            $propertiesString
+                        );
+                    }
+                }
+
+                // remove placeholder
+                $element->removeAttribute(
+                    'data-css-to-inline-styles-original-styles'
+                );
+            }
+        }
+
+        // strip original style tags if we need to
+        if ($this->stripOriginalStyleTags) {
+            $this->stripOriginalStyleTags($xPath);
+        }
+
+        // cleanup the HTML if we need to
+        if ($this->cleanup) {
+            $this->cleanupHTML($xPath);
+        }
+
+        // should we output XHTML?
+        if ($outputXHTML) {
+            // set formating
+            $document->formatOutput = true;
+
+            // get the HTML as XML
+            $html = $document->saveXML(null, LIBXML_NOEMPTYTAG);
+
+            // remove the XML-header
+            $html = ltrim(preg_replace('/<\?xml (.*)\?>/', '', $html));
+        } // just regular HTML 4.01 as it should be used in newsletters
+        else {
+            // get the HTML
+            $html = $document->saveHTML();
+        }
+
+        // return
+        return $html;
+    }
+
+    /**
+     * Split a style string into an array of properties.
+     * The returned array can contain empty strings.
+     *
+     * @param string $styles ex: 'color:blue;font-size:12px;'
+     * @return array an array of strings containing css property ex: array('color:blue','font-size:12px')
+     */
+    private function splitIntoProperties($styles) {
+        $properties = (array) explode(';', $styles);
+
+        for ($i = 0; $i < count($properties); $i++) {
+            // If next property begins with base64,
+            // Then the ';' was part of this property (and we should not have split on it).
+            if (isset($properties[$i + 1]) && strpos($properties[$i + 1], 'base64,') === 0) {
+                $properties[$i] .= ';' . $properties[$i + 1];
+                $properties[$i + 1] = '';
+                $i += 1;
+            }
+        }
+        return $properties;
+    }
+
+    /**
+     * Get the encoding to use
+     *
+     * @return string
+     */
+    private function getEncoding()
+    {
+        return $this->encoding;
+    }
+
+    /**
+     * Process the loaded CSS
+     *
+     * @return array
+     */
+    private function processCSS()
+    {
+        // init vars
+        $css = (string) $this->css;
+        $cssRules = array();
+
+        // remove newlines
+        $css = str_replace(array("\r", "\n"), '', $css);
+
+        // replace double quotes by single quotes
+        $css = str_replace('"', '\'', $css);
+
+        // remove comments
+        $css = preg_replace('|/\*.*?\*/|', '', $css);
+
+        // remove spaces
+        $css = preg_replace('/\s\s+/', ' ', $css);
+
+        if ($this->excludeMediaQueries) {
+            $css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
+        }
+
+        // rules are splitted by }
+        $rules = (array) explode('}', $css);
+
+        // init var
+        $i = 1;
+
+        // loop rules
+        foreach ($rules as $rule) {
+            // split into chunks
+            $chunks = explode('{', $rule);
+
+            // invalid rule?
+            if (!isset($chunks[1])) {
+                continue;
+            }
+
+            // set the selectors
+            $selectors = trim($chunks[0]);
+
+            // get cssProperties
+            $cssProperties = trim($chunks[1]);
+
+            // split multiple selectors
+            $selectors = (array) explode(',', $selectors);
+
+            // loop selectors
+            foreach ($selectors as $selector) {
+                // cleanup
+                $selector = trim($selector);
+
+                // build an array for each selector
+                $ruleSet = array();
+
+                // store selector
+                $ruleSet['selector'] = $selector;
+
+                // process the properties
+                $ruleSet['properties'] = $this->processCSSProperties(
+                    $cssProperties
+                );
+
+                // calculate specificity
+                $ruleSet['specificity'] = Specificity::fromSelector($selector);
+
+                // remember the order in which the rules appear
+                $ruleSet['order'] = $i;
+
+                // add into global rules
+                $cssRules[] = $ruleSet;
+            }
+
+            // increment
+            $i++;
+        }
+
+        // sort based on specificity
+        if (!empty($cssRules)) {
+            usort($cssRules, array(__CLASS__, 'sortOnSpecificity'));
+        }
+
+        return $cssRules;
+    }
+
+    /**
+     * Process the CSS-properties
+     *
+     * @return array
+     * @param  string $propertyString The CSS-properties.
+     */
+    private function processCSSProperties($propertyString)
+    {
+        // split into chunks
+        $properties = $this->splitIntoProperties($propertyString);
+
+        // init var
+        $pairs = array();
+
+        // loop properties
+        foreach ($properties as $property) {
+            // split into chunks
+            $chunks = (array) explode(':', $property, 2);
+
+            // validate
+            if (!isset($chunks[1])) {
+                continue;
+            }
+
+            // cleanup
+            $chunks[0] = trim($chunks[0]);
+            $chunks[1] = trim($chunks[1]);
+
+            // add to pairs array
+            if (!isset($pairs[$chunks[0]]) ||
+                !in_array($chunks[1], $pairs[$chunks[0]])
+            ) {
+                $pairs[$chunks[0]][] = $chunks[1];
+            }
+        }
+
+        // sort the pairs
+        ksort($pairs);
+
+        // return
+        return $pairs;
+    }
+
+    /**
+     * Should the IDs and classes be removed?
+     *
+     * @return void
+     * @param  bool [optional] $on Should we enable cleanup?
+     */
+    public function setCleanup($on = true)
+    {
+        $this->cleanup = (bool) $on;
+    }
+
+    /**
+     * Set CSS to use
+     *
+     * @return void
+     * @param  string $css The CSS to use.
+     */
+    public function setCSS($css)
+    {
+        $this->css = (string) $css;
+    }
+
+    /**
+     * Set the encoding to use with the DOMDocument
+     *
+     * @return void
+     * @param  string $encoding The encoding to use.
+     *
+     * @deprecated Doesn't have any effect
+     */
+    public function setEncoding($encoding)
+    {
+        $this->encoding = (string) $encoding;
+    }
+
+    /**
+     * Set HTML to process
+     *
+     * @return void
+     * @param  string $html The HTML to process.
+     */
+    public function setHTML($html)
+    {
+        $this->html = (string) $html;
+    }
+
+    /**
+     * Set use of inline styles block
+     * If this is enabled the class will use the style-block in the HTML.
+     *
+     * @return void
+     * @param  bool [optional] $on Should we process inline styles?
+     */
+    public function setUseInlineStylesBlock($on = true)
+    {
+        $this->useInlineStylesBlock = (bool) $on;
+    }
+
+    /**
+     * Set strip original style tags
+     * If this is enabled the class will remove all style tags in the HTML.
+     *
+     * @return void
+     * @param  bool [optional] $on Should we process inline styles?
+     */
+    public function setStripOriginalStyleTags($on = true)
+    {
+        $this->stripOriginalStyleTags = (bool) $on;
+    }
+
+    /**
+     * Set exclude media queries
+     *
+     * If this is enabled the media queries will be removed before inlining the rules
+     *
+     * @return void
+     * @param bool [optional] $on
+     */
+    public function setExcludeMediaQueries($on = true)
+    {
+        $this->excludeMediaQueries = (bool) $on;
+    }
+
+    /**
+     * Strip style tags into the generated HTML
+     *
+     * @return string
+     * @param  \DOMXPath $xPath The DOMXPath for the entire document.
+     */
+    private function stripOriginalStyleTags(\DOMXPath $xPath)
+    {
+        // Get all style tags
+        $nodes = $xPath->query('descendant-or-self::style');
+
+        foreach ($nodes as $node) {
+            if ($this->excludeMediaQueries) {
+                //Search for Media Queries
+                preg_match_all('/@media [^{]*{([^{}]|{[^{}]*})*}/', $node->nodeValue, $mqs);
+
+                // Replace the nodeValue with just the Media Queries
+                $node->nodeValue = implode("\n", $mqs[0]);
+            } else {
+                // Remove the entire style tag
+                $node->parentNode->removeChild($node);
+            }
+        }
+    }
+
+    /**
+     * Sort an array on the specificity element
+     *
+     * @return int
+     * @param  array $e1 The first element.
+     * @param  array $e2 The second element.
+     */
+    private static function sortOnSpecificity($e1, $e2)
+    {
+        // Compare the specificity
+        $value = $e1['specificity']->compareTo($e2['specificity']);
+
+        // if the specificity is the same, use the order in which the element appeared
+        if ($value === 0) {
+            $value = $e1['order'] - $e2['order'];
+        }
+
+        return $value;
+    }
+}

vendor/tijsverkoyen/css-to-inline-styles/src/Exception.php

@@ -0,0 +1,11 @@
+<?php
+namespace TijsVerkoyen\CssToInlineStyles;
+
+/**
+ * CssToInlineStyles Exception class
+ *
+ * @author    Tijs Verkoyen <php-css-to-inline-styles@verkoyen.eu>
+ */
+class Exception extends \Exception
+{
+}

vendor/tijsverkoyen/css-to-inline-styles/src/Selector.php

@@ -0,0 +1,44 @@
+<?php
+namespace TijsVerkoyen\CssToInlineStyles;
+
+use Symfony\Component\CssSelector\CssSelector;
+use Symfony\Component\CssSelector\CssSelectorConverter;
+use Symfony\Component\CssSelector\Exception\ExceptionInterface;
+
+/**
+ * CSS to Inline Styles Selector class.
+ *
+ */
+class Selector
+{
+    /**
+     * The CSS selector
+     *
+     * @var string
+     */
+    protected $selector;
+    
+    /**
+     * @param  string $selector The CSS selector
+     */
+    public function __construct($selector)
+    {
+        $this->selector = $selector;
+    }
+    
+    public function toXPath()
+    {
+        try {
+            if (class_exists('Symfony\Component\CssSelector\CssSelectorConverter')) {
+                $converter = new CssSelectorConverter();
+                $query = $converter->toXPath($this->selector);
+            } else {
+                $query = CssSelector::toXPath($this->selector);
+            }
+        } catch (ExceptionInterface $e) {
+            $query = null;
+        }
+        
+        return $query;
+    }
+}

vendor/tijsverkoyen/css-to-inline-styles/src/Specificity.php

@@ -0,0 +1,133 @@
+<?php
+namespace TijsVerkoyen\CssToInlineStyles;
+
+/**
+ * CSS to Inline Styles Specificity class.
+ *
+ * Compare specificity based on the CSS3 spec.
+ *
+ * @see http://www.w3.org/TR/selectors/#specificity
+ *
+ */
+class Specificity
+{
+
+    /**
+     * The number of ID selectors in the selector
+     *
+     * @var int
+     */
+    private $a;
+
+    /**
+     *
+     * The number of class selectors, attributes selectors, and pseudo-classes in the selector
+     *
+     * @var int
+     */
+    private $b;
+
+    /**
+     * The number of type selectors and pseudo-elements in the selector
+     *
+     * @var int
+     */
+    private $c;
+
+    /**
+     * @param int $a The number of ID selectors in the selector
+     * @param int $b The number of class selectors, attributes selectors, and pseudo-classes in the selector
+     * @param int $c The number of type selectors and pseudo-elements in the selector
+     */
+    public function __construct($a = 0, $b = 0, $c = 0)
+    {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+
+    /**
+     * Increase the current specificity by adding the three values
+     *
+     * @param int $a The number of ID selectors in the selector
+     * @param int $b The number of class selectors, attributes selectors, and pseudo-classes in the selector
+     * @param int $c The number of type selectors and pseudo-elements in the selector
+     */
+    public function increase($a, $b, $c)
+    {
+        $this->a += $a;
+        $this->b += $b;
+        $this->c += $c;
+    }
+
+    /**
+     * Get the specificity values as an array
+     *
+     * @return array
+     */
+    public function getValues()
+    {
+        return array($this->a, $this->b, $this->c);
+    }
+
+    /**
+     * Calculate the specificity based on a CSS Selector string,
+     * Based on the patterns from premailer/css_parser by Alex Dunae
+     *
+     * @see https://github.com/premailer/css_parser/blob/master/lib/css_parser/regexps.rb
+     * @param string $selector
+     * @return static
+     */
+    public static function fromSelector($selector)
+    {
+        $pattern_a = "  \#";
+        $pattern_b = "  (\.[\w]+)                     # classes
+                        |
+                        \[(\w+)                       # attributes
+                        |
+                        (\:(                          # pseudo classes
+                          link|visited|active
+                          |hover|focus
+                          |lang
+                          |target
+                          |enabled|disabled|checked|indeterminate
+                          |root
+                          |nth-child|nth-last-child|nth-of-type|nth-last-of-type
+                          |first-child|last-child|first-of-type|last-of-type
+                          |only-child|only-of-type
+                          |empty|contains
+                        ))";
+
+        $pattern_c = "  ((^|[\s\+\>\~]+)[\w]+       # elements
+                        |
+                        \:{1,2}(                    # pseudo-elements
+                          after|before
+                          |first-letter|first-line
+                          |selection
+                        )
+                      )";
+
+        return new static(
+            preg_match_all("/{$pattern_a}/ix", $selector, $matches),
+            preg_match_all("/{$pattern_b}/ix", $selector, $matches),
+            preg_match_all("/{$pattern_c}/ix", $selector, $matches)
+        );
+    }
+
+    /**
+     * Returns <0 when $specificity is greater, 0 when equal, >0 when smaller
+     *
+     * @param Specificity $specificity
+     * @return int
+     */
+    public function compareTo(Specificity $specificity)
+    {
+        if ($this->a !== $specificity->a) {
+            return $this->a - $specificity->a;
+        } elseif ($this->b !== $specificity->b) {
+            return $this->b - $specificity->b;
+        } else {
+            return $this->c - $specificity->c;
+        }
+    }
+}