Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add inline and block properties #1

Draft
wants to merge 3 commits into
base: render
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/AngleSharp.Css/Constants/InitialValues.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,18 @@ static class InitialValues
public static readonly ICssValue MinWidthDecl = new Constant<Length>(CssKeywords.Auto, Length.Auto);
public static readonly ICssValue MaxHeightDecl = new Constant<Object>(CssKeywords.None, null);
public static readonly ICssValue MaxWidthDecl = new Constant<Object>(CssKeywords.None, null);
public static readonly ICssValue MarginBlockEndDecl = Length.Zero;
public static readonly ICssValue MarginBlockStartDecl = Length.Zero;
public static readonly ICssValue MarginInlineEndDecl = Length.Zero;
public static readonly ICssValue MarginInlineStartDecl = Length.Zero;
public static readonly ICssValue MarginLeftDecl = Length.Zero;
public static readonly ICssValue MarginBottomDecl = Length.Zero;
public static readonly ICssValue MarginRightDecl = Length.Zero;
public static readonly ICssValue MarginTopDecl = Length.Zero;
public static readonly ICssValue PaddingBlockEndDecl = Length.Zero;
public static readonly ICssValue PaddingBlockStartDecl = Length.Zero;
public static readonly ICssValue PaddingInlineEndDecl = Length.Zero;
public static readonly ICssValue PaddingInlineStartDecl = Length.Zero;
public static readonly ICssValue PaddingLeftDecl = Length.Zero;
public static readonly ICssValue PaddingBottomDecl = Length.Zero;
public static readonly ICssValue PaddingRightDecl = Length.Zero;
Expand Down
62 changes: 61 additions & 1 deletion src/AngleSharp.Css/Constants/PropertyNames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ public static class PropertyNames
/// The layout-grid-line declaration.
/// </summary>
public static readonly String LayoutGridLine = "layout-grid-line";

/// <summary>
/// The grid-template-rows declaration.
/// </summary>
Expand Down Expand Up @@ -802,6 +802,36 @@ public static class PropertyNames
/// </summary>
public static readonly String ListStyle = "list-style";

/// <summary>
/// The margin-block declaration.
/// </summary>
public static readonly String MarginBlock = "margin-block";

/// <summary>
/// The margin-block-end declaration.
/// </summary>
public static readonly String MarginBlockEnd = "margin-block-end";

/// <summary>
/// The margin-block-start declaration.
/// </summary>
public static readonly String MarginBlockStart = "margin-block-start";

/// <summary>
/// The margin-inline declaration.
/// </summary>
public static readonly String MarginInline = "margin-inline";

/// <summary>
/// The margin-inline-end declaration.
/// </summary>
public static readonly String MarginInlineEnd = "margin-inline-end";

/// <summary>
/// The margin-inline-start declaration.
/// </summary>
public static readonly String MarginInlineStart = "margin-inline-start";

/// <summary>
/// The margin-right declaration.
/// </summary>
Expand Down Expand Up @@ -927,6 +957,36 @@ public static class PropertyNames
/// </summary>
public static readonly String OverflowWrap = "overflow-wrap";

/// <summary>
/// The padding-block declaration.
/// </summary>
public static readonly String PaddingBlock = "padding-block";

/// <summary>
/// The padding-block-end declaration.
/// </summary>
public static readonly String PaddingBlockEnd = "padding-block-end";

/// <summary>
/// The padding-block-start declaration.
/// </summary>
public static readonly String PaddingBlockStart = "padding-block-start";

/// <summary>
/// The padding-inline declaration.
/// </summary>
public static readonly String PaddingInline = "padding-inline";

/// <summary>
/// The padding-inline-end declaration.
/// </summary>
public static readonly String PaddingInlineEnd = "padding-inline-end";

/// <summary>
/// The padding-inline-start declaration.
/// </summary>
public static readonly String PaddingInlineStart = "padding-inline-start";

/// <summary>
/// The padding-top declaration.
/// </summary>
Expand Down
44 changes: 44 additions & 0 deletions src/AngleSharp.Css/Converters/FlowRelativeValueConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
namespace AngleSharp.Css.Converters
{
using AngleSharp.Css.Dom;
using AngleSharp.Css.Parser;
using AngleSharp.Css.Values;
using AngleSharp.Text;
using System;

sealed class FlowRelativeValueConverter : IValueConverter
{
private readonly IValueConverter _converter;

public FlowRelativeValueConverter(IValueConverter converter)
{
_converter = converter;
}

public ICssValue Convert(StringSource source)
{
var options = new ICssValue[2];
var length = 0;

for (var i = 0; i < options.Length; i++)
{
options[i] = _converter.Convert(source);
source.SkipSpacesAndComments();

if (options[length] != null)
{
length++;
}
}

if (length > 0)
{
var values = new ICssValue[length];
Array.Copy(options, values, length);
return new CssFlowRelativeValue(values);
}

return null;
}
}
}
56 changes: 56 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginBlockDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
namespace AngleSharp.Css.Declarations
{
using AngleSharp.Css.Converters;
using AngleSharp.Css.Dom;
using AngleSharp.Css.Values;
using AngleSharp.Text;
using System;
using static ValueConverters;

static class MarginBlockDeclaration
{
public static String Name = PropertyNames.MarginBlock;

public static IValueConverter Converter = new MarginBlockAggregator();

public static ICssValue InitialValue = null;

public static PropertyFlags Flags = PropertyFlags.Shorthand;

public static String[] Longhands = new[]
{
PropertyNames.MarginBlockStart,
PropertyNames.MarginBlockEnd,
};

sealed class MarginBlockAggregator : IValueAggregator, IValueConverter
{
private static readonly IValueConverter converter = Or(AutoLengthOrPercentConverter, AssignInitial(Length.Zero)).FlowRelative();

public ICssValue Convert(StringSource source) => converter.Convert(source);

public ICssValue Merge(ICssValue[] values)
{
var start = values[0];
var end = values[1];

if (start != null && end != null)
{
return new CssFlowRelativeValue(new[] { start, end });
}

return null;
}

public ICssValue[] Split(ICssValue value)
{
if (value is CssFlowRelativeValue flowRelative)
{
return new[] { flowRelative.Start, flowRelative.End };
}

return null;
}
}
}
}
22 changes: 22 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginBlockEndDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace AngleSharp.Css.Declarations
{
using System;
using Dom;
using static ValueConverters;

public class MarginBlockEndDeclaration
{
public static String Name = PropertyNames.MarginBlockEnd;

public static String[] Shorthands = new[]
{
PropertyNames.MarginBlock,
};

public static IValueConverter Converter = AutoLengthOrPercentConverter;

public static ICssValue InitialValue = InitialValues.MarginBlockEndDecl;

public static PropertyFlags Flags = PropertyFlags.Unitless | PropertyFlags.Animatable;
}
}
22 changes: 22 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginBlockStartDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace AngleSharp.Css.Declarations
{
using System;
using Dom;
using static ValueConverters;

public class MarginBlockStartDeclaration
{
public static String Name = PropertyNames.MarginBlockStart;

public static String[] Shorthands = new[]
{
PropertyNames.MarginBlock,
};

public static IValueConverter Converter = AutoLengthOrPercentConverter;

public static ICssValue InitialValue = InitialValues.MarginBlockStartDecl;

public static PropertyFlags Flags = PropertyFlags.Unitless | PropertyFlags.Animatable;
}
}
56 changes: 56 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginInlineDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
namespace AngleSharp.Css.Declarations
{
using AngleSharp.Css.Converters;
using AngleSharp.Css.Dom;
using AngleSharp.Css.Values;
using AngleSharp.Text;
using System;
using static ValueConverters;

static class MarginInlineDeclaration
{
public static String Name = PropertyNames.MarginInline;

public static IValueConverter Converter = new MarginInlineAggregator();

public static ICssValue InitialValue = null;

public static PropertyFlags Flags = PropertyFlags.Shorthand;

public static String[] Longhands = new[]
{
PropertyNames.MarginInlineStart,
PropertyNames.MarginInlineEnd,
};

sealed class MarginInlineAggregator : IValueAggregator, IValueConverter
{
private static readonly IValueConverter converter = Or(AutoLengthOrPercentConverter, AssignInitial(Length.Zero)).FlowRelative();

public ICssValue Convert(StringSource source) => converter.Convert(source);

public ICssValue Merge(ICssValue[] values)
{
var start = values[0];
var end = values[1];

if (start != null && end != null)
{
return new CssFlowRelativeValue(new[] { start, end });
}

return null;
}

public ICssValue[] Split(ICssValue value)
{
if (value is CssFlowRelativeValue flowRelative)
{
return new[] { flowRelative.Start, flowRelative.End };
}

return null;
}
}
}
}
22 changes: 22 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginInlineEndDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace AngleSharp.Css.Declarations
{
using System;
using Dom;
using static ValueConverters;

public class MarginInlineEndDeclaration
{
public static String Name = PropertyNames.MarginInlineEnd;

public static String[] Shorthands = new[]
{
PropertyNames.MarginInline,
};

public static IValueConverter Converter = AutoLengthOrPercentConverter;

public static ICssValue InitialValue = InitialValues.MarginInlineEndDecl;

public static PropertyFlags Flags = PropertyFlags.Unitless | PropertyFlags.Animatable;
}
}
22 changes: 22 additions & 0 deletions src/AngleSharp.Css/Declarations/MarginInlineStartDeclaration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace AngleSharp.Css.Declarations
{
using System;
using Dom;
using static ValueConverters;

public class MarginInlineStartDeclaration
{
public static String Name = PropertyNames.MarginInlineStart;

public static String[] Shorthands = new[]
{
PropertyNames.MarginInline,
};

public static IValueConverter Converter = AutoLengthOrPercentConverter;

public static ICssValue InitialValue = InitialValues.MarginInlineStartDecl;

public static PropertyFlags Flags = PropertyFlags.Unitless | PropertyFlags.Animatable;
}
}
Loading