Putting \r tags before others

This fixes the case when \r tag at the end cancels effect of other tags
weizhenye · Aug 25, 2023 · fbeeba6 · fbeeba6
1 parent 223816b
commit fbeeba6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/dist/ass-compiler.js b/dist/ass-compiler.js
@@ -1088,8 +1088,7 @@
       .filter(function (slice) { return slice.fragments.length; })
       .map(function (slice, idx) {
         var sliceCopy = JSON.parse(JSON.stringify(slice));
-        var ref = sliceCopy.fragments[0];
-        var tag = ref.tag;
+        var tag = {};
         if (idx) {
           tag.r = slice.style === dia.style ? '' : slice.style;
         } else {
@@ -1102,6 +1101,7 @@
             }
           });
         }
+        sliceCopy.fragments[0].tag = Object.assign(tag, sliceCopy.fragments[0].tag);
         return sliceCopy;
       })
       .map(decompileSlice)

diff --git a/dist/ass-compiler.min.js b/dist/ass-compiler.min.js
diff --git a/src/decompiler.js b/src/decompiler.js
@@ -74,7 +74,7 @@ export function decompileText(dia, style) {
     .filter((slice) => slice.fragments.length)
     .map((slice, idx) => {
       const sliceCopy = JSON.parse(JSON.stringify(slice));
-      const { tag } = sliceCopy.fragments[0];
+      const tag = {};
       if (idx) {
         tag.r = slice.style === dia.style ? '' : slice.style;
       } else {
@@ -87,6 +87,7 @@ export function decompileText(dia, style) {
           }
         });
       }
+      sliceCopy.fragments[0].tag = Object.assign(tag, sliceCopy.fragments[0].tag);
       return sliceCopy;
     })
     .map(decompileSlice)

diff --git a/test/decompiler.js b/test/decompiler.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { decompile, decompileDrawing, decompileTag } from '../src/decompiler.js';
+import { decompile, decompileDrawing, decompileTag, decompileText } from '../src/decompiler.js';
 import { compiled, decompiled, compiled2, decompiled2 } from './fixtures/decompiler.js';
 
 describe('ASS decompiler', () => {
@@ -127,4 +127,26 @@ describe('ASS decompiler', () => {
       })).to.deep.equal('\\t(1,2,3,\\clip(11,21,12,22))\\t(4,5,6,\\b1\\fr30)');
     });
   });
+  describe('text decompiler', () => {
+    it('should put \\r to the beginning of tags', () => {
+      expect(decompileText({
+        alignment: 1,
+        slices: [{
+          style: 'Default',
+          fragments: [{
+            text: 'Hello',
+            tag: { t: [{ t1: 0, t2: 1000, accel: 1, tag: { c1: 'FF' } }] },
+          }],
+        }, {
+          style: 'Nondefault',
+          fragments: [{
+            text: 'World',
+            tag: { t: [{ t1: 1000, t2: 2000, accel: 1, tag: { c1: 'FFFF' } }] },
+          }],
+        }],
+      }, {
+        Alignment: 1,
+      })).to.equal('{\\t(0,1000,1,\\1c&HFF&)}Hello{\\rNondefault\\t(1000,2000,1,\\1c&HFFFF&)}World');
+    });
+  });
 });