Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Fix readingOrder #328

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix readingOrder #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion source/lib/style/classes/alignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class Alignment { // §18.8.1 alignment (Alignment)
}

if (opts.readingOrder !== undefined) {
this.readingOrder = types.alignment.readingOrder.validate(opts.readingOrder) === true ? opts.readingOrder : null;
const value = types.alignment.readingOrder[opts.readingOrder];
this.readingOrder = types.alignment.readingOrder.validate(opts.readingOrder) === true ? value: null;
}

if (opts.indent !== undefined) {
Expand Down
4 changes: 2 additions & 2 deletions tests/style.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test('Set Style Properties', (t) => {
t.ok(styleObj.alignment.horizontal === 'center', 'alignment.horizontal correctly set');
t.ok(styleObj.alignment.indent === 1, 'alignment.indent correctly set');
t.ok(styleObj.alignment.justifyLastLine === true, 'alignment.justifyLastLine correctly set');
t.ok(styleObj.alignment.readingOrder === 'leftToRight', 'alignment.readingOrder correctly set');
t.ok(styleObj.alignment.readingOrder === 1, 'alignment.readingOrder correctly set');
t.ok(styleObj.alignment.relativeIndent === 1, 'alignment.relativeIndent correctly set');
t.ok(styleObj.alignment.shrinkToFit === false, 'alignment.shrinkToFit correctly set');
t.ok(styleObj.alignment.textRotation === 0, 'alignment.textRotation correctly set');
Expand Down Expand Up @@ -122,7 +122,7 @@ test('Set Style Properties', (t) => {
let alignmentXMLele = xmlbuilder.create('test');
style.alignment.addToXMLele(alignmentXMLele);
let alignmentXMLString = alignmentXMLele.doc().end();
t.ok(alignmentXMLString === '<?xml version="1.0"?><test><alignment horizontal="center" indent="1" justifyLastLine="1" readingOrder="leftToRight" relativeIndent="1" textRotation="0" vertical="bottom" wrapText="1"/></test>', 'Alignment XML generated successfully');
t.ok(alignmentXMLString === '<?xml version="1.0"?><test><alignment horizontal="center" indent="1" justifyLastLine="1" readingOrder="1" relativeIndent="1" textRotation="0" vertical="bottom" wrapText="1"/></test>', 'Alignment XML generated successfully');

let fontXMLele = xmlbuilder.create('test');
style.font.addToXMLele(fontXMLele);
Expand Down