From 7a74cd0bca6c300b9cc3cd2880c8b8822307b293 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 10 Jan 2014 15:28:03 +0000 Subject: Fix filename. --- src/select/properties/Makefile | 2 +- src/select/properties/widows.c | 47 +++++++++++++++++++++++++++++++++++++++++ src/select/properties/windows.c | 47 ----------------------------------------- 3 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 src/select/properties/widows.c delete mode 100644 src/select/properties/windows.c (limited to 'src') diff --git a/src/select/properties/Makefile b/src/select/properties/Makefile index eacc240..8905695 100644 --- a/src/select/properties/Makefile +++ b/src/select/properties/Makefile @@ -107,8 +107,8 @@ visibility.c \ voice_family.c \ volume.c \ white_space.c \ +widows.c \ width.c \ -windows.c \ word_spacing.c \ writing_mode.c \ z_index.c diff --git a/src/select/properties/widows.c b/src/select/properties/widows.c new file mode 100644 index 0000000..916966a --- /dev/null +++ b/src/select/properties/widows.c @@ -0,0 +1,47 @@ +/* + * This file is part of LibCSS + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2009 John-Mark Bell + */ + +#include "bytecode/bytecode.h" +#include "bytecode/opcodes.h" +#include "select/propset.h" +#include "select/propget.h" +#include "utils/utils.h" + +#include "select/properties/properties.h" +#include "select/properties/helpers.h" + +css_error css__cascade_widows(uint32_t opv, css_style *style, + css_select_state *state) +{ + return css__cascade_number(opv, style, state, set_widows); +} + +css_error css__set_widows_from_hint(const css_hint *hint, + css_computed_style *style) +{ + return set_widows(style, hint->status, hint->data.integer); +} + +css_error css__initial_widows(css_select_state *state) +{ + return set_widows(state->computed, CSS_WIDOWS_SET, 2); +} + +css_error css__compose_widows(const css_computed_style *parent, + const css_computed_style *child, + css_computed_style *result) +{ + int32_t count = 0; + uint8_t type = get_widows(child, &count); + + if (type == CSS_WIDOWS_INHERIT) { + type = get_widows(parent, &count); + } + + return set_widows(result, type, count); +} + diff --git a/src/select/properties/windows.c b/src/select/properties/windows.c deleted file mode 100644 index 916966a..0000000 --- a/src/select/properties/windows.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of LibCSS - * Licensed under the MIT License, - * http://www.opensource.org/licenses/mit-license.php - * Copyright 2009 John-Mark Bell - */ - -#include "bytecode/bytecode.h" -#include "bytecode/opcodes.h" -#include "select/propset.h" -#include "select/propget.h" -#include "utils/utils.h" - -#include "select/properties/properties.h" -#include "select/properties/helpers.h" - -css_error css__cascade_widows(uint32_t opv, css_style *style, - css_select_state *state) -{ - return css__cascade_number(opv, style, state, set_widows); -} - -css_error css__set_widows_from_hint(const css_hint *hint, - css_computed_style *style) -{ - return set_widows(style, hint->status, hint->data.integer); -} - -css_error css__initial_widows(css_select_state *state) -{ - return set_widows(state->computed, CSS_WIDOWS_SET, 2); -} - -css_error css__compose_widows(const css_computed_style *parent, - const css_computed_style *child, - css_computed_style *result) -{ - int32_t count = 0; - uint8_t type = get_widows(child, &count); - - if (type == CSS_WIDOWS_INHERIT) { - type = get_widows(parent, &count); - } - - return set_widows(result, type, count); -} - -- cgit v1.2.3