Skip to content

Commit

Permalink
0.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
weizhenye committed Feb 27, 2018
1 parent 08c4ff9 commit a0d77e1
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions dist/ass.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ var numTags = [
var numRegexs = numTags.map(function (nt) { return ({ name: nt, regex: new RegExp(("^" + nt + "-?\\d")) }); });

function parseTag(text) {
var assign;

var tag = {};
for (var i = 0; i < numRegexs.length; i++) {
var ref = numRegexs[i];
Expand Down Expand Up @@ -70,7 +72,6 @@ function parseTag(text) {
var alpha = ref$2[2];
tag[("a" + num$1)] = alpha;
} else if (/^alpha&?H?[0-9a-f]+/i.test(text)) {
var assign;
(assign = text.match(/^alpha&?H?([0-9a-f]+)/i), tag.alpha = assign[1]);
tag.alpha = ("00" + (tag.alpha)).slice(-2);
} else if (/^(?:pos|org|move|fad|fade)\(/.test(text)) {
Expand Down Expand Up @@ -328,6 +329,8 @@ function isValid(cmd) {
}

function getViewBox(commands) {
var ref;

var minX = Infinity;
var minY = Infinity;
var maxX = -Infinity;
Expand All @@ -351,7 +354,6 @@ function getViewBox(commands) {
width: maxX - minX,
height: maxY - minY,
};
var ref;
}

/**
Expand Down Expand Up @@ -409,6 +411,8 @@ function toSVGPath(instructions) {
}

function compileDrawing(rawCommands) {
var ref$1;

var commands = [];
var i = 0;
while (i < rawCommands.length) {
Expand Down Expand Up @@ -463,7 +467,6 @@ function compileDrawing(rawCommands) {
);

return assign({ instructions: instructions, d: toSVGPath(instructions) }, getViewBox(commands));
var ref$1;
}

var tTags = [
Expand Down Expand Up @@ -664,7 +667,6 @@ function compileText(ref) {
}

function compileDialogues(ref) {
var info = ref.info;
var styles = ref.styles;
var dialogues = ref.dialogues;

Expand All @@ -679,7 +681,6 @@ function compileDialogues(ref) {
dia.Style = 'Default';
}
var stl = styles[dia.Style].style;
var timer = info.Timer / 100 || 1;
var compiledText = compileText({
styles: styles,
name: dia.Style,
Expand All @@ -691,8 +692,8 @@ function compileDialogues(ref) {
minLayer = Math.min(minLayer, dia.Layer);
results.push(assign({
layer: dia.Layer,
start: dia.Start / timer,
end: dia.End / timer,
start: dia.Start,
end: dia.End,
// reset style by `\r` will not effect margin and alignment
margin: {
left: dia.MarginL || stl.MarginL,
Expand Down Expand Up @@ -830,7 +831,6 @@ function compile(text, options) {
collisions: tree.info.Collisions || 'Normal',
styles: styles,
dialogues: compileDialogues({
info: tree.info,
styles: styles,
dialogues: tree.events.dialogue,
}),
Expand Down
16 changes: 8 additions & 8 deletions dist/ass.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ var numTags = [
var numRegexs = numTags.map(function (nt) { return ({ name: nt, regex: new RegExp(("^" + nt + "-?\\d")) }); });

function parseTag(text) {
var assign;

var tag = {};
for (var i = 0; i < numRegexs.length; i++) {
var ref = numRegexs[i];
Expand Down Expand Up @@ -76,7 +78,6 @@ function parseTag(text) {
var alpha = ref$2[2];
tag[("a" + num$1)] = alpha;
} else if (/^alpha&?H?[0-9a-f]+/i.test(text)) {
var assign;
(assign = text.match(/^alpha&?H?([0-9a-f]+)/i), tag.alpha = assign[1]);
tag.alpha = ("00" + (tag.alpha)).slice(-2);
} else if (/^(?:pos|org|move|fad|fade)\(/.test(text)) {
Expand Down Expand Up @@ -334,6 +335,8 @@ function isValid(cmd) {
}

function getViewBox(commands) {
var ref;

var minX = Infinity;
var minY = Infinity;
var maxX = -Infinity;
Expand All @@ -357,7 +360,6 @@ function getViewBox(commands) {
width: maxX - minX,
height: maxY - minY,
};
var ref;
}

/**
Expand Down Expand Up @@ -415,6 +417,8 @@ function toSVGPath(instructions) {
}

function compileDrawing(rawCommands) {
var ref$1;

var commands = [];
var i = 0;
while (i < rawCommands.length) {
Expand Down Expand Up @@ -469,7 +473,6 @@ function compileDrawing(rawCommands) {
);

return assign({ instructions: instructions, d: toSVGPath(instructions) }, getViewBox(commands));
var ref$1;
}

var tTags = [
Expand Down Expand Up @@ -670,7 +673,6 @@ function compileText(ref) {
}

function compileDialogues(ref) {
var info = ref.info;
var styles = ref.styles;
var dialogues = ref.dialogues;

Expand All @@ -685,7 +687,6 @@ function compileDialogues(ref) {
dia.Style = 'Default';
}
var stl = styles[dia.Style].style;
var timer = info.Timer / 100 || 1;
var compiledText = compileText({
styles: styles,
name: dia.Style,
Expand All @@ -697,8 +698,8 @@ function compileDialogues(ref) {
minLayer = Math.min(minLayer, dia.Layer);
results.push(assign({
layer: dia.Layer,
start: dia.Start / timer,
end: dia.End / timer,
start: dia.Start,
end: dia.End,
// reset style by `\r` will not effect margin and alignment
margin: {
left: dia.MarginL || stl.MarginL,
Expand Down Expand Up @@ -836,7 +837,6 @@ function compile(text, options) {
collisions: tree.info.Collisions || 'Normal',
styles: styles,
dialogues: compileDialogues({
info: tree.info,
styles: styles,
dialogues: tree.events.dialogue,
}),
Expand Down
2 changes: 1 addition & 1 deletion dist/ass.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "assjs",
"version": "0.0.4",
"version": "0.0.5",
"description": "A JavaScript ASS subtitle format renderer",
"main": "dist/ass.js",
"module": "dist/ass.esm.js",
Expand Down

0 comments on commit a0d77e1

Please sign in to comment.