Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/lexborisov/Modest.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander <lex.borisov@gmail.com>2020-08-09 20:42:24 +0300
committerAlexander <lex.borisov@gmail.com>2020-08-09 20:42:24 +0300
commit393338d994c921705ff71dfbd1d98ceb31328f14 (patch)
tree2e6e3c22c7ecfda9616f57cda0b00c8afeb86c53
parent9003954b20c7575d9e296398fb6ec716d40082af (diff)
Update includes.
-rw-r--r--include/modest/finder/resource.h3
-rw-r--r--include/mycss/declaration/default_entries.h1
-rw-r--r--include/mycss/declaration/entry_destroy.h2
-rw-r--r--include/mycss/property/const.h6
-rw-r--r--include/mycss/property/parser.h1
-rw-r--r--include/mycss/syntax_ending.h39
-rwxr-xr-xinclude/myhtml/api.h24
-rw-r--r--include/myhtml/myhtml.h3
-rwxr-xr-xsource/myhtml/api.h24
9 files changed, 92 insertions, 11 deletions
diff --git a/include/modest/finder/resource.h b/include/modest/finder/resource.h
index 206f641..278ee4b 100644
--- a/include/modest/finder/resource.h
+++ b/include/modest/finder/resource.h
@@ -54,7 +54,8 @@ static const modest_finder_selector_type_f modest_finder_static_selector_sub_typ
modest_finder_selector_sub_type_pseudo_class_function_nth_last_child, /* MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_NTH_LAST_CHILD */
modest_finder_selector_sub_type_pseudo_class_function_nth_last_column, /* MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_NTH_LAST_COLUMN */
modest_finder_selector_sub_type_pseudo_class_function_nth_last_of_type, /* MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_NTH_LAST_OF_TYPE */
- modest_finder_selector_sub_type_pseudo_class_function_nth_of_type /* MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_NTH_OF_TYPE */
+ modest_finder_selector_sub_type_pseudo_class_function_nth_of_type /* MyCSS_SELECTORS_SUB_TYPE_PSEUDO_CLASS_FUNCTION_NTH_OF_TYPE */
+
};
/* see enum mycss_selectors_sub_type (mycss_selectors_sub_type_t) on mycss/selectors/myosi.h */
diff --git a/include/mycss/declaration/default_entries.h b/include/mycss/declaration/default_entries.h
index 78ba134..9a20575 100644
--- a/include/mycss/declaration/default_entries.h
+++ b/include/mycss/declaration/default_entries.h
@@ -801,6 +801,7 @@ static mycss_declaration_entry_t mycss_declaration_default_entry_vertical_align
NULL, NULL
};
+
static mycss_declaration_entry_t mycss_declaration_default_entry_border_spacing = {
MyCSS_PROPERTY_TYPE_BORDER_SPACING,
MyCSS_PROPERTY_VALUE_UNDEF,
diff --git a/include/mycss/declaration/entry_destroy.h b/include/mycss/declaration/entry_destroy.h
index 75ceabd..b89817f 100644
--- a/include/mycss/declaration/entry_destroy.h
+++ b/include/mycss/declaration/entry_destroy.h
@@ -40,6 +40,7 @@ mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_color(mycss_d
mycss_declaration_entry_t * mycss_declaration_entry_destroy_font(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_x(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_top_right_radius(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
+mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_spacing(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_top_left_radius(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_bottom_right_radius(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_bottom_left_radius(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
@@ -48,7 +49,6 @@ mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_image(myc
mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_repeat(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_position(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
mycss_declaration_entry_t * mycss_declaration_entry_destroy_background_size(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
-mycss_declaration_entry_t * mycss_declaration_entry_destroy_border_spacing(mycss_declaration_t* declaration, mycss_declaration_entry_t* decl_entry, bool self_destroy);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/include/mycss/property/const.h b/include/mycss/property/const.h
index a62aa84..8881359 100644
--- a/include/mycss/property/const.h
+++ b/include/mycss/property/const.h
@@ -1117,12 +1117,6 @@ enum mycss_property_border_top_right_radius {
}
typedef mycss_property_border_top_right_radius_t;
-enum mycss_property_border_spacing {
- MyCSS_PROPERTY_BORDER_SPACING_INHERIT = 0x0092,
- MyCSS_PROPERTY_BORDER_SPACING__LENGTH = 0x019a,
-}
-typedef mycss_property_border_spacing_t;
-
enum mycss_property_border_top_style {
MyCSS_PROPERTY_BORDER_TOP_STYLE_NONE = 0x00d3,
MyCSS_PROPERTY_BORDER_TOP_STYLE_SOLID = 0x013d,
diff --git a/include/mycss/property/parser.h b/include/mycss/property/parser.h
index 4a1b171..76694ea 100644
--- a/include/mycss/property/parser.h
+++ b/include/mycss/property/parser.h
@@ -131,7 +131,6 @@ bool mycss_property_parser_border_right(mycss_entry_t* entry, mycss_token_t* tok
bool mycss_property_parser_border_right_color(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
bool mycss_property_parser_border_right_style(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
bool mycss_property_parser_border_right_width(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
-bool mycss_property_parser_short_two_type(mycss_entry_t* entry, mycss_token_t* token);
bool mycss_property_parser_border_spacing(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
bool mycss_property_parser_border_style(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
bool mycss_property_parser_border_top(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
diff --git a/include/mycss/syntax_ending.h b/include/mycss/syntax_ending.h
new file mode 100644
index 0000000..5de25d4
--- /dev/null
+++ b/include/mycss/syntax_ending.h
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2016-2017 Alexander Borisov
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Author: lex.borisov@gmail.com (Alexander Borisov)
+ */
+
+#ifndef MyCSS_SYNTAX_ENDING_H
+#define MyCSS_SYNTAX_ENDING_H
+#pragma once
+
+#ifdef __cplusplus
+//extern "C" {
+#endif
+
+#include <mycss/myosi.h>
+#include <mycss/mycss.h>
+#include <mycss/entry.h>
+
+bool mycss_syntax_list_of_rules(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* MyCSS_SYNTAX_ENDING_H */
diff --git a/include/myhtml/api.h b/include/myhtml/api.h
index 5f46ad6..5106e3a 100755
--- a/include/myhtml/api.h
+++ b/include/myhtml/api.h
@@ -36,7 +36,7 @@
#define MyHTML_VERSION_MAJOR 4
#define MyHTML_VERSION_MINOR 0
-#define MyHTML_VERSION_PATCH 5
+#define MyHTML_VERSION_PATCH 6
#define MyHTML_VERSION_STRING MyCORE_STR(MyHTML_VERSION_MAJOR) MyCORE_STR(.) MyCORE_STR(MyHTML_VERSION_MINOR) MyCORE_STR(.) MyCORE_STR(MyHTML_VERSION_PATCH)
@@ -1160,6 +1160,28 @@ myhtml_node_create(myhtml_tree_t* tree, myhtml_tag_id_t tag_id,
enum myhtml_namespace ns);
/**
+ * Cloning a node
+ *
+ * @param[in] the tree into which the cloned node will be inserted. myhtml_tree_t*
+ * @param[in] cloning node
+ *
+ * @return myhtml_tree_node_t* if successful, otherwise a NULL value
+ */
+myhtml_tree_node_t *
+myhtml_node_clone(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
+
+/**
+ * Cloning a node with all children
+ *
+ * @param[in] the tree into which the cloned node will be inserted. myhtml_tree_t*
+ * @param[in] cloning node
+ *
+ * @return myhtml_tree_node_t* if successful, otherwise a NULL value
+ */
+myhtml_tree_node_t *
+myhtml_node_clone_deep(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
+
+/**
* Release allocated resources
*
* @param[in] myhtml_tree_node_t*
diff --git a/include/myhtml/myhtml.h b/include/myhtml/myhtml.h
index 35e2526..ef1888e 100644
--- a/include/myhtml/myhtml.h
+++ b/include/myhtml/myhtml.h
@@ -161,6 +161,8 @@ myhtml_tree_node_t * myhtml_node_insert_after(myhtml_tree_node_t *target, myhtml
myhtml_tree_node_t * myhtml_node_insert_before(myhtml_tree_node_t *target, myhtml_tree_node_t *node);
myhtml_tree_node_t * myhtml_node_create(myhtml_tree_t* tree, myhtml_tag_id_t tag_id, enum myhtml_namespace ns);
+myhtml_tree_node_t * myhtml_node_clone(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
+myhtml_tree_node_t * myhtml_node_clone_deep(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
myhtml_tree_node_t * myhtml_node_remove(myhtml_tree_node_t *node);
void myhtml_node_delete(myhtml_tree_node_t *node);
void myhtml_node_delete_recursive(myhtml_tree_node_t *node);
@@ -221,6 +223,7 @@ mystatus_t myhtml_queue_add(myhtml_tree_t *tree, size_t begin, myhtml_token_node
/* version */
myhtml_version_t myhtml_version(void);
+
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/source/myhtml/api.h b/source/myhtml/api.h
index 5f46ad6..5106e3a 100755
--- a/source/myhtml/api.h
+++ b/source/myhtml/api.h
@@ -36,7 +36,7 @@
#define MyHTML_VERSION_MAJOR 4
#define MyHTML_VERSION_MINOR 0
-#define MyHTML_VERSION_PATCH 5
+#define MyHTML_VERSION_PATCH 6
#define MyHTML_VERSION_STRING MyCORE_STR(MyHTML_VERSION_MAJOR) MyCORE_STR(.) MyCORE_STR(MyHTML_VERSION_MINOR) MyCORE_STR(.) MyCORE_STR(MyHTML_VERSION_PATCH)
@@ -1160,6 +1160,28 @@ myhtml_node_create(myhtml_tree_t* tree, myhtml_tag_id_t tag_id,
enum myhtml_namespace ns);
/**
+ * Cloning a node
+ *
+ * @param[in] the tree into which the cloned node will be inserted. myhtml_tree_t*
+ * @param[in] cloning node
+ *
+ * @return myhtml_tree_node_t* if successful, otherwise a NULL value
+ */
+myhtml_tree_node_t *
+myhtml_node_clone(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
+
+/**
+ * Cloning a node with all children
+ *
+ * @param[in] the tree into which the cloned node will be inserted. myhtml_tree_t*
+ * @param[in] cloning node
+ *
+ * @return myhtml_tree_node_t* if successful, otherwise a NULL value
+ */
+myhtml_tree_node_t *
+myhtml_node_clone_deep(myhtml_tree_t* dest_tree, myhtml_tree_node_t* src);
+
+/**
* Release allocated resources
*
* @param[in] myhtml_tree_node_t*