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.

Sign up for GitHub

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

Added support for HTML fragments in Document Assembler Content tag #86

Merged
merged 11 commits into from
Dec 8, 2024
+602 −119
Merged

Added support for HTML fragments in Document Assembler Content tag #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69704e9
Added inline HTML support in Document Assembler with associated tests…
MalcolmJohnston Nov 11, 2024
4199871
Ran csharpier!
MalcolmJohnston Nov 11, 2024
562f5cd
Fixed behaviour of HtmlConverter to allow returning of multiple eleme…
MalcolmJohnston Nov 11, 2024
e7198e6
Fixed issue with duplicate package references as I had added via nuge…
MalcolmJohnston Nov 11, 2024
676acd7
feat: merge master
sergey-tihon Nov 15, 2024
ae73d4f
fix: no more paket
sergey-tihon Nov 15, 2024
2605f71
Removed HTML Agility Pack.
MalcolmJohnston Nov 19, 2024
9dcc093
Work in progress. Builds!
MalcolmJohnston Nov 19, 2024
33499a5
Updated to use HtmlToWmlConverter type approach.
MalcolmJohnston Nov 26, 2024
5c013d8
Merge pull request #1 from MalcolmJohnston/feature/document-assembler…
MalcolmJohnston Nov 26, 2024
761ec97
Csharpier fixes.
MalcolmJohnston Nov 26, 2024
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
13 changes: 5 additions & 8 deletions Clippit.Tests/Word/DocumentAssemblerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ public DocumentAssemblerTests(ITestOutputHelper log)
[InlineData("DA285-ImageSelectNoParagraphFollowedAfterMetadata.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA285A-ImageSelectNoParagraphFollowedAfterMetadata.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA-I0038-TemplateWithMultipleXPathResults.docx", "DA-I0038-Data.xml", false)]
[InlineData("DA289A-xhtml-formatting.docx", "DA-html-input.xml", false)]
[InlineData("DA289B-html-not-supported.docx", "DA-html-input.xml", true)]
[InlineData("DA289C-not-well-formed-xhtml.docx", "DA-html-input.xml", true)]
public void DA101(string name, string data, bool err)
{
var templateDocx = new FileInfo(Path.Combine(_sourceDir.FullName, name));
Expand Down Expand Up @@ -185,14 +188,8 @@ public void DA259(string name, string data, bool err)
Path.Combine(TempDir, name.Replace(".docx", "-processed-by-DocumentAssembler.docx"))
);
var afterAssembling = new WmlDocument(assembledDocx.FullName);
var brCount = afterAssembling
.MainDocumentPart.Element(W.body)
.Elements(W.p)
.ElementAt(1)
.Elements(W.r)
.Elements(W.br)
.Count();
Assert.Equal(4, brCount);
var brCount = afterAssembling.MainDocumentPart.Element(W.body).Elements(W.p).Count();
Assert.Equal(6, brCount);
}

[Theory]
Expand Down
42 changes: 23 additions & 19 deletions Clippit/Html/HtmlToWmlConverterCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ private static object NormalizeTransform(XNode node)
return node;
}

private enum NextExpected
internal enum NextExpected
{
Paragraph,
Run,
Expand Down Expand Up @@ -2830,7 +2830,7 @@ string pictureDescription
</a:graphicData>
</a:graphic>
#endif
private static XElement GetParagraphProperties(
internal static XElement GetParagraphProperties(
XElement blockLevelElement,
string styleName,
HtmlToWmlConverterSettings settings
Expand Down Expand Up @@ -3041,14 +3041,18 @@ private static XElement[] GetSpacingProperties(XElement paragraph, HtmlToWmlConv
return new XElement[] { spacing, ind, contextualSpacing };
}

private static XElement GetRunProperties(XText textNode, HtmlToWmlConverterSettings settings)
internal static XElement GetRunProperties(XText textNode, HtmlToWmlConverterSettings settings)
{
var parent = textNode.Parent;
var rPr = GetRunProperties(parent, settings);
return rPr;
if (parent != null)
{
return GetRunProperties(parent, settings);
}

return new XElement(W.rPr);
}

private static XElement GetRunProperties(XElement element, HtmlToWmlConverterSettings settings)
internal static XElement GetRunProperties(XElement element, HtmlToWmlConverterSettings settings)
{
var colorProperty = element.GetProp("color");
var fontFamilyProperty = element.GetProp("font-family");
Expand All @@ -3060,15 +3064,15 @@ private static XElement GetRunProperties(XElement element, HtmlToWmlConverterSet
var letterSpacingProperty = element.GetProp("letter-spacing");
var directionProp = element.GetProp("direction");

var colorPropertyString = colorProperty.ToString();
var colorPropertyString = colorProperty?.ToString();
var fontFamilyString = GetUsedFontFromFontFamilyProperty(fontFamilyProperty);
var fontSizeTPoint = GetUsedSizeFromFontSizeProperty(fontSizeProperty);
var textDecorationString = textDecorationProperty.ToString();
var fontStyleString = fontStyleProperty.ToString();
var fontWeightString = fontWeightProperty.ToString().ToLower();
var backgroundColorString = backgroundColorProperty.ToString().ToLower();
var letterSpacingString = letterSpacingProperty.ToString().ToLower();
var directionString = directionProp.ToString().ToLower();
var textDecorationString = textDecorationProperty?.ToString();
var fontStyleString = fontStyleProperty?.ToString();
var fontWeightString = fontWeightProperty?.ToString().ToLower();
var backgroundColorString = backgroundColorProperty?.ToString().ToLower();
var letterSpacingString = letterSpacingProperty?.ToString().ToLower();
var directionString = directionProp?.ToString().ToLower();

var subAncestor = element.AncestorsAndSelf(XhtmlNoNamespace.sub).Any();
var supAncestor = element.AncestorsAndSelf(XhtmlNoNamespace.sup).Any();
Expand All @@ -3085,7 +3089,7 @@ private static XElement GetRunProperties(XElement element, HtmlToWmlConverterSet
dirAttributeString = dirAttribute.Value.ToLower();

XElement shd = null;
if (backgroundColorString != "transparent")
if (backgroundColorString != null && backgroundColorString != "transparent")
shd = new XElement(
W.shd,
new XAttribute(W.val, "clear"),
Expand Down Expand Up @@ -3155,7 +3159,7 @@ private static XElement GetRunProperties(XElement element, HtmlToWmlConverterSet
rStyle = new XElement(W.rStyle, new XAttribute(W.val, "Hyperlink"));

XElement spacing = null;
if (letterSpacingProperty.IsNotNormal)
if (letterSpacingProperty != null && letterSpacingProperty.IsNotNormal)
spacing = new XElement(W.spacing, new XAttribute(W.val, (long)(Twip)letterSpacingProperty));

XElement rtl = null;
Expand Down Expand Up @@ -3191,9 +3195,9 @@ private static XElement GetRunProperties(XElement element, HtmlToWmlConverterSet
// todo this is not right - needs to be rationalized for all characters in an entire paragraph.
// if there is text like <p>abc <em> def </em> ghi</p> then there needs to be just one space between abc and def, and between
// def and ghi.
private static string GetDisplayText(XText node, bool preserveWhiteSpace)
internal static string GetDisplayText(XText node, bool preserveWhiteSpace)
{
var textTransform = node.Parent.GetProp("text-transform").ToString();
var textTransform = node.Parent.GetProp("text-transform")?.ToString();
var isFirst = node.Parent.Name == XhtmlNoNamespace.p && node == node.Parent.FirstNode;
var isLast = node.Parent.Name == XhtmlNoNamespace.p && node == node.Parent.LastNode;

Expand Down Expand Up @@ -3884,7 +3888,7 @@ private static XElement GetTableRowProperties(XElement element)
return trPr;
}

private static XAttribute GetXmlSpaceAttribute(string value)
internal static XAttribute GetXmlSpaceAttribute(string value)
{
if (value.StartsWith(" ") || value.EndsWith(" "))
return new XAttribute(XNamespace.Xml + "space", "preserve");
Expand Down Expand Up @@ -4331,7 +4335,7 @@ private static XElement GetBackgroundProperty(XElement element)
var color = element.GetProp("background-color");

// todo this really should test against default background color
if (color.ToString() != "transparent")
if (color != null && color.ToString() != "transparent")
{
var hexString = color.ToString();
var shd = new XElement(
Expand Down
Loading
Loading