split html layout code into sub directory

10 files changed, 33 insertions, 20 deletions

diff --git a/content/handlers/html/Makefile b/content/handlers/html/Makefile
index 5b75d0748..1f9aea5f0 100644
--- a/content/handlers/html/Makefile
+++ b/content/handlers/html/Makefile
@@ -15,13 +15,14 @@ S_HTML := box_construct.c	\
 	html.c			\
 	imagemap.c		\
 	interaction.c		\
-	layout.c		\
-	layout_block.c		\
-	layout_flex.c		\
-	layout_table.c		\
 	object.c		\
 	redraw.c		\
 	redraw_border.c		\
 	script.c		\
 	table.c			\
 	textselection.c
+
+# HTML content handler layout sources
+include content/handlers/html/layout/Makefile
+
+S_HTML += $(addprefix layout/,$(S_HTML_LAYOUT))
diff --git a/content/handlers/html/layout/Makefile b/content/handlers/html/layout/Makefile
new file mode 100644
index 000000000..483fd52bf
--- /dev/null
+++ b/content/handlers/html/layout/Makefile
@@ -0,0 +1,8 @@
+# HTML content handler layout sources
+
+S_HTML_LAYOUT := \
+	document.c	\
+	block.c	\
+	flex.c	\
+	table.c
+
diff --git a/content/handlers/html/layout_block.c b/content/handlers/html/layout/block.c
index 41950b871..25683077a 100644
--- a/content/handlers/html/layout_block.c
+++ b/content/handlers/html/layout/block.c
@@ -35,10 +35,11 @@
 #include "html/box_inspect.h"
 #include "html/font.h"
 #include "html/form_internal.h"
-#include "html/layout_internal.h"
-#include "html/layout_flex.h"
-#include "html/layout_table.h"
-#include "html/layout_block.h"
+
+#include "html/layout/internal.h"
+#include "html/layout/flex.h"
+#include "html/layout/table.h"
+#include "html/layout/block.h"
 
 
 /**
diff --git a/content/handlers/html/layout_block.h b/content/handlers/html/layout/block.h
index 2bbdbb45b..2bbdbb45b 100644
--- a/content/handlers/html/layout_block.h
+++ b/content/handlers/html/layout/block.h
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout/document.c
index adf36e52e..2ae9256e6 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout/document.c
@@ -66,13 +66,14 @@
 #include "html/box_inspect.h"
 #include "html/font.h"
 #include "html/form_internal.h"
-#include "html/layout.h"
-#include "html/layout_block.h"
-#include "html/layout_flex.h"
-#include "html/layout_table.h"
-#include "html/layout_internal.h"
 #include "html/table.h"
 
+#include "html/layout.h"
+#include "html/layout/block.h"
+#include "html/layout/flex.h"
+#include "html/layout/table.h"
+#include "html/layout/internal.h"
+
 /** Array of per-side access functions for computed style margins. */
 const css_len_func margin_funcs[4] = {
 	[TOP]    = css_computed_margin_top,
diff --git a/content/handlers/html/layout_flex.c b/content/handlers/html/layout/flex.c
index 3860c8e14..6f13edbae 100644
--- a/content/handlers/html/layout_flex.c
+++ b/content/handlers/html/layout/flex.c
@@ -40,10 +40,11 @@
 #include "html/html.h"
 #include "html/private.h"
 #include "html/box_inspect.h"
-#include "html/layout_internal.h"
-#include "html/layout_table.h"
-#include "html/layout_block.h"
-#include "html/layout_flex.h"
+
+#include "html/layout/internal.h"
+#include "html/layout/table.h"
+#include "html/layout/block.h"
+#include "html/layout/flex.h"
 
 /**
  * Flex item data
diff --git a/content/handlers/html/layout_flex.h b/content/handlers/html/layout/flex.h
index e4f8ebc2b..e4f8ebc2b 100644
--- a/content/handlers/html/layout_flex.h
+++ b/content/handlers/html/layout/flex.h
diff --git a/content/handlers/html/layout_internal.h b/content/handlers/html/layout/internal.h
index 145b926d5..145b926d5 100644
--- a/content/handlers/html/layout_internal.h
+++ b/content/handlers/html/layout/internal.h
diff --git a/content/handlers/html/layout_table.c b/content/handlers/html/layout/table.c
index 19521eb7b..07a642413 100644
--- a/content/handlers/html/layout_table.c
+++ b/content/handlers/html/layout/table.c
@@ -34,9 +34,10 @@
 #include "html/private.h"
 #include "html/box.h"
 #include "html/table.h"
-#include "html/layout_internal.h"
-#include "html/layout_block.h"
-#include "html/layout_table.h"
+
+#include "html/layout/internal.h"
+#include "html/layout/block.h"
+#include "html/layout/table.h"
 
 /**
  * Moves the children of a box by a specified amount
diff --git a/content/handlers/html/layout_table.h b/content/handlers/html/layout/table.h
index d5d283005..d5d283005 100644
--- a/content/handlers/html/layout_table.h
+++ b/content/handlers/html/layout/table.h