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

Jump to bottom

LT-21633: Improve Bidi handling in Word Export #15

Merged
merged 3 commits into from
Apr 3, 2024
Merged

LT-21633: Improve Bidi handling in Word Export #15

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34dd5b1
LT-21633: Improve Bidi handling in Word Export
aror92 Mar 25, 2024
cf12cbc
LT-21633: Improve Bidi handling in Word Export
aror92 Mar 25, 2024
9e7743f
Merge branch 'release/9.1' into feature/writing-systems
aror92 Apr 3, 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
20 changes: 11 additions & 9 deletions Src/xWorks/WordStylesGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ internal static Style GenerateWordStyleFromLcmStyleSheet(

if (exportStyleInfo.HasTrailingIndent)
{
// Check bidirectional flag to determine correct orientation for indent
if (exportStyleInfo.DirectionIsRightToLeft == TriStateBool.triTrue)
parProps.Append(new Indentation() { Left = MilliPtToTwentiPt(exportStyleInfo.TrailingIndent).ToString() });
else
Expand All @@ -279,23 +280,18 @@ internal static Style GenerateWordStyleFromLcmStyleSheet(
ancestorIndents = CalculateParagraphIndentsFromAncestors(ancestorIndents.Ancestor, styleSheet, new AncestorIndents(0f, 0f));
var leadingIndent = CalculateMarginLeft(exportStyleInfo, ancestorIndents, hangingIndent);

// Check bidirectional flag to determine correct orientation for indent
if (exportStyleInfo.DirectionIsRightToLeft == TriStateBool.triTrue)
parProps.Append(new Indentation() { Right = leadingIndent.ToString() });
else
parProps.Append(new Indentation() { Left = leadingIndent.ToString() });
}
}

// If text direction is specified, add specification to paragraph properties
if (exportStyleInfo.DirectionIsRightToLeft != TriStateBool.triNotSet)
// If text direction is right to left, add BiDi property to the paragraph.
if (exportStyleInfo.DirectionIsRightToLeft == TriStateBool.triTrue)
{
parProps.Append(new BiDi());

if (exportStyleInfo.DirectionIsRightToLeft == TriStateBool.triTrue)
parProps.Append(new TextDirection() { Val = TextDirectionValues.TopToBottomRightToLeft });

else
parProps.Append(new TextDirection() { Val = TextDirectionValues.LefToRightTopToBottom });
}
exportStyle.Append(parProps);
}
Expand Down Expand Up @@ -441,12 +437,18 @@ private static Style GenerateWordStyleFromWsOptions(ConfigurableDictionaryNode c
// if the writing system isn't a magic name just use it otherwise find the right one from the magic list
var wsIdString = possiblyMagic == 0 ? ws.Id : WritingSystemServices.GetWritingSystemList(cache, possiblyMagic, true).First().Id;
var wsId = cache.LanguageWritingSystemFactoryAccessor.GetWsFromStr(wsIdString);
var wsString = String.Format("[lang=\'{0}\']", wsIdString).Trim('.');

var wsStyle = new Style();

if (!string.IsNullOrEmpty(configNode.Style))
wsStyle = GenerateWordStyleFromLcmStyleSheet(configNode.Style, wsId, propertyTable);

wsStyle.StyleId = configNode.Style + (String.Format("[lang=\'{0}\']", wsIdString)).Trim('.');
//style should be based on the span for the current ws as well as the style info for the current node that is independent from the ws
wsStyle.Append(new BasedOn() { Val = "span" + wsString });
wsStyle.Append(new BasedOn() { Val = configNode.Style });

wsStyle.StyleId = configNode.Style + wsString;

if (!IsEmptyStyle(wsStyle))
return wsStyle;
Expand Down
Loading