@vivliostyle/core 2.15.8 → 2.17.1

package/lib/vivliostyle/css-validator.d.ts

@@ -101,6 +101,7 @@ export declare const ALLOW_ZERO = 512;
 export declare const ALLOW_ZERO_PERCENT = 1024;
 export declare const ALLOW_SLASH = 2048;
 export declare const ALLOW_URANGE = 4096;
+export declare const ALLOW_IMAGE = 8192;
 export declare type ValueMap = {
     [key: string]: Css.Val;
 };
@@ -124,61 +125,19 @@ export declare class PrimitiveValidator extends PropertyValidator {
     readonly idents: ValueMap;
     readonly units: ValueMap;
     constructor(allowed: number, idents: ValueMap, units: ValueMap);
-    /**
-     * @override
-     */
     visitEmpty(empty: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitSlash(slash: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitStr(str: Css.Str): Css.Val;
-    /**
-     * @override
-     */
     visitIdent(ident: Css.Ident): Css.Val;
-    /**
-     * @override
-     */
     visitNumeric(numeric: Css.Numeric): Css.Val;
-    /**
-     * @override
-     */
     visitNum(num: Css.Num): Css.Val;
-    /**
-     * @override
-     */
     visitInt(num: Css.Int): Css.Val;
-    /**
-     * @override
-     */
-    visitColor(color: Css.Color): Css.Val;
-    /**
-     * @override
-     */
+    visitHexColor(color: Css.HexColor): Css.Val;
     visitURL(url: Css.URL): Css.Val;
-    /**
-     * @override
-     */
     visitURange(urange: Css.URange): Css.Val;
-    /**
-     * @override
-     */
     visitSpaceList(list: Css.SpaceList): Css.Val;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     visitFunc(func: Css.Func): Css.Val;
-    /**
-     * @override
-     */
     visitExpr(expr: Css.Expr): Css.Val;
     combine(other: PrimitiveValidator): PrimitiveValidator;
 }
@@ -193,103 +152,37 @@ export declare class ListValidator extends PropertyValidator {
     constructor(group: ValidatingGroup);
     validateList(arr: Css.Val[], slice: boolean, startIndex: number): Css.Val[];
     validateSingle(inval: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitEmpty(empty: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitSlash(slash: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitStr(str: Css.Str): Css.Val;
-    /**
-     * @override
-     */
     visitIdent(ident: Css.Ident): Css.Val;
-    /**
-     * @override
-     */
     visitNumeric(numeric: Css.Numeric): Css.Val;
-    /**
-     * @override
-     */
     visitNum(num: Css.Num): Css.Val;
-    /**
-     * @override
-     */
     visitInt(num: Css.Int): Css.Val;
-    /**
-     * @override
-     */
-    visitColor(color: Css.Color): Css.Val;
-    /**
-     * @override
-     */
+    visitHexColor(color: Css.HexColor): Css.Val;
     visitURL(url: Css.URL): Css.Val;
-    /**
-     * @override
-     */
     visitURange(urange: Css.URange): Css.Val;
-    /**
-     * @override
-     */
     visitSpaceList(list: Css.SpaceList): Css.Val;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     visitFunc(func: Css.Func): Css.Val;
-    /**
-     * @override
-     */
     visitExpr(expr: Css.Expr): Css.Val;
 }
 export declare class SpaceListValidator extends ListValidator {
     constructor(group: ValidatingGroup);
-    /**
-     * @override
-     */
     visitSpaceList(list: Css.SpaceList): Css.Val;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     validateForShorthand(values: Css.Val[], index: number): Css.Val[];
 }
 export declare class CommaListValidator extends ListValidator {
     constructor(group: ValidatingGroup);
-    /**
-     * @override
-     */
     visitSpaceList(list: Css.SpaceList): Css.Val;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     validateForShorthand(values: Css.Val[], index: number): Css.Val[];
 }
 export declare class FuncValidator extends ListValidator {
     readonly name: string;
     constructor(name: string, group: ValidatingGroup);
-    /**
-     * @override
-     */
     validateSingle(inval: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitFunc(func: Css.Func): Css.Val;
 }
 export declare class ShorthandSyntaxNode {
@@ -303,30 +196,18 @@ export declare class ShorthandSyntaxProperty extends ShorthandSyntaxNode {
     readonly name: string;
     validator: PropertyValidator;
     constructor(validatorSet: ValidatorSet, name: string);
-    /**
-     * @override
-     */
     tryParse(values: Css.Val[], index: number, shorthandValidator: ShorthandValidator): number;
-    /**
-     * @override
-     */
     success(rval: Css.Val, shorthandValidator: ShorthandValidator): void;
 }
 export declare class ShorthandSyntaxPropertyN extends ShorthandSyntaxProperty {
     readonly names: string[];
     constructor(validatorSet: ValidatorSet, names: string[]);
-    /**
-     * @override
-     */
     success(rval: Css.Val, shorthandValidator: ShorthandValidator): void;
 }
 export declare class ShorthandSyntaxCompound extends ShorthandSyntaxNode {
     readonly nodes: ShorthandSyntaxNode[];
     readonly slash: boolean;
     constructor(nodes: ShorthandSyntaxNode[], slash: boolean);
-    /**
-     * @override
-     */
     tryParse(values: Css.Val[], index: number, shorthandValidator: ShorthandValidator): number;
 }
 export declare class ShorthandValidator extends Css.Visitor {
@@ -340,78 +221,33 @@ export declare class ShorthandValidator extends Css.Visitor {
     clone(): this;
     init(syntax: ShorthandSyntaxNode[], propList: string[]): void;
     finish(important: boolean, receiver: PropertyReceiver): boolean;
-    propagateInherit(important: boolean, receiver: PropertyReceiver): void;
+    propagateDefaultingValue(value: Css.Val, important: boolean, receiver: PropertyReceiver): void;
     validateList(list: Css.Val[]): number;
     validateSingle(val: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitEmpty(empty: Css.Val): Css.Val;
-    /**
-     * @override
-     */
     visitStr(str: Css.Str): Css.Val;
-    /**
-     * @override
-     */
     visitIdent(ident: Css.Ident): Css.Val;
-    /**
-     * @override
-     */
     visitNumeric(numeric: Css.Numeric): Css.Val;
-    /**
-     * @override
-     */
     visitNum(num: Css.Num): Css.Val;
-    /**
-     * @override
-     */
     visitInt(num: Css.Int): Css.Val;
-    /**
-     * @override
-     */
-    visitColor(color: Css.Color): Css.Val;
-    /**
-     * @override
-     */
+    visitHexColor(color: Css.HexColor): Css.Val;
     visitURL(url: Css.URL): Css.Val;
-    /**
-     * @override
-     */
     visitSpaceList(list: Css.SpaceList): Css.Val;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     visitFunc(func: Css.Func): Css.Val;
-    /**
-     * @override
-     */
     visitExpr(expr: Css.Expr): Css.Val;
 }
 export declare class SimpleShorthandValidator extends ShorthandValidator {
     constructor();
-    /**
-     * @override
-     */
     validateList(list: Css.Val[]): number;
 }
 export declare class InsetsShorthandValidator extends ShorthandValidator {
     constructor();
-    /**
-     * @override
-     */
     validateList(list: Css.Val[]): number;
     createSyntaxNode(): ShorthandSyntaxPropertyN;
 }
 export declare class InsetsSlashShorthandValidator extends ShorthandValidator {
     constructor();
-    /**
-     * @override
-     */
     validateList(list: Css.Val[]): number;
 }
 export declare class CommaShorthandValidator extends SimpleShorthandValidator {
@@ -419,30 +255,20 @@ export declare class CommaShorthandValidator extends SimpleShorthandValidator {
     mergeIn(acc: {
         [key: string]: Css.Val[];
     }, values: ValueMap): void;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
 }
 export declare class FontShorthandValidator extends SimpleShorthandValidator {
     constructor();
-    /**
-     * @override
-     */
     init(syntax: ShorthandSyntaxNode[], propList: string[]): void;
-    /**
-     * @override
-     */
     validateList(list: Css.Val[]): number;
-    /**
-     * @override
-     */
     visitCommaList(list: Css.CommaList): Css.Val;
-    /**
-     * @override
-     */
     visitIdent(ident: Css.Ident): Css.Val;
 }
+export declare class AllShorthandValidator extends SimpleShorthandValidator {
+    constructor();
+    init(syntax: ShorthandSyntaxNode[], propList: string[]): void;
+    validateList(list: Css.Val[]): number;
+}
 export declare const shorthandValidators: {
     [key: string]: typeof ShorthandValidator;
 };
@@ -487,3 +313,4 @@ export declare class ValidatorSet {
     validatePropertyAndHandleShorthand(name: string, value: Css.Val, important: boolean, receiver: PropertyReceiver): void;
 }
 export declare function baseValidatorSet(): ValidatorSet;
+export declare function containsVar(val: Css.Val): boolean;

package/lib/vivliostyle/css.d.ts

@@ -21,10 +21,7 @@
 import * as Base from "./base";
 import * as Exprs from "./exprs";
 export declare class Visitor {
-    /**
-     * @return void
-     */
-    visitValues(values: Val[]): any;
+    visitValues(values: Val[]): Val[];
     visitEmpty(empty: Val): Val;
     visitSlash(slash: Val): Val;
     visitStr(str: Str): Val;
@@ -32,7 +29,7 @@ export declare class Visitor {
     visitNumeric(numeric: Numeric): Val;
     visitNum(num: Num): Val;
     visitInt(num: Int): Val;
-    visitColor(color: Color): Val;
+    visitHexColor(color: HexColor): Val;
     visitURL(url: URL): Val;
     visitURange(urange: URange): Val;
     visitSpaceList(list: SpaceList): Val;
@@ -41,65 +38,26 @@ export declare class Visitor {
     visitExpr(expr: Expr): Val;
 }
 export declare class FilterVisitor extends Visitor {
+    error: boolean;
     constructor();
     visitValues(values: Val[]): Val[];
-    /**
-     * @override
-     */
+    visitEmpty(empty: Val): Val;
     visitStr(str: Str): Val;
-    /**
-     * @override
-     */
     visitIdent(ident: Ident): Val;
-    /**
-     * @override
-     */
     visitSlash(slash: Val): Val;
-    /**
-     * @override
-     */
     visitNumeric(numeric: Numeric): Val;
-    /**
-     * @override
-     */
     visitNum(num: Num): Val;
-    /**
-     * @override
-     */
     visitInt(num: Int): Val;
-    /**
-     * @override
-     */
-    visitColor(color: Color): Val;
-    /**
-     * @override
-     */
+    visitHexColor(color: HexColor): Val;
     visitURL(url: URL): Val;
-    /**
-     * @override
-     */
     visitURange(urange: URange): Val;
-    /**
-     * @override
-     */
     visitSpaceList(list: SpaceList): Val;
-    /**
-     * @override
-     */
     visitCommaList(list: CommaList): Val;
-    /**
-     * @override
-     */
     visitFunc(func: Func): Val;
-    /**
-     * @override
-     */
     visitExpr(expr: Expr): Val;
 }
 export declare class Val {
-    /**
-     * @override
-     */
+    /** @override */
     toString(): string;
     stringValue(): string;
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
@@ -109,78 +67,39 @@ export declare class Val {
     isNum(): boolean;
     isIdent(): boolean;
     isSpaceList(): boolean;
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class Empty extends Val {
     private static empty;
     static get instance(): Empty;
     private constructor();
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare const empty: Empty;
 export declare class Slash extends Val {
     private static slash;
     static get instance(): Slash;
     private constructor();
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare const slash: Slash;
 export declare class Str extends Val {
     str: string;
     constructor(str: string);
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class Ident extends Val {
     name: string;
     constructor(name: string);
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
-    /**
-     * @override
-     */
+    visit(visitor: Visitor): Val;
     isIdent(): boolean;
 }
 export declare function getName(name: string): Ident;
@@ -188,148 +107,78 @@ export declare class Numeric extends Val {
     num: number;
     unit: string;
     constructor(num: number, unit: string);
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
-    /**
-     * @override
-     */
+    visit(visitor: Visitor): Val;
     isNumeric(): boolean;
 }
 export declare class Num extends Val {
     num: number;
     constructor(num: number);
-    /**
-     * @override
-     */
     toExpr(scope: Exprs.LexicalScope, ref: Exprs.Val): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
-    /**
-     * @override
-     */
+    visit(visitor: Visitor): Val;
     isNum(): boolean;
 }
 export declare class Int extends Num {
     constructor(num: number);
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
-export declare class Color extends Val {
-    rgb: number;
-    constructor(rgb: number);
-    /**
-     * @override
-     */
+export declare class HexColor extends Val {
+    hex: string;
+    constructor(hex: string);
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class URL extends Val {
     url: string;
     constructor(url: string);
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class URange extends Val {
     urangeText: string;
     constructor(urangeText: string);
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare function appendList(buf: Base.StringBuffer, values: Val[], separator: string, toString: boolean): void;
 export declare class SpaceList extends Val {
     values: Val[];
     constructor(values: Val[]);
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
-    /**
-     * @override
-     */
+    visit(visitor: Visitor): Val;
     isSpaceList(): boolean;
 }
 export declare class CommaList extends Val {
     values: Val[];
     constructor(values: Val[]);
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class Func extends Val {
     name: string;
     values: Val[];
     constructor(name: string, values: Val[]);
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
+    visit(visitor: Visitor): Val;
 }
 export declare class Expr extends Val {
     expr: Exprs.Val;
     constructor(expr: Exprs.Val);
-    /**
-     * @override
-     */
     toExpr(): Exprs.Val;
-    /**
-     * @override
-     */
     appendTo(buf: Base.StringBuffer, toString: boolean): void;
-    /**
-     * @override
-     */
-    visit(visitor: any): any;
-    /**
-     * @override
-     */
+    visit(visitor: Visitor): Val;
     isExpr(): boolean;
 }
+/**
+ * Custom property value, may be arbitrary token
+ */
+export declare class AnyToken extends Val {
+    text: string;
+    constructor(text: string);
+    appendTo(buf: Base.StringBuffer, toString: boolean): void;
+}
 export declare function toNumber(val: Val, context: Exprs.Context): number;
 /**
  * Convert numeric value to px
@@ -347,7 +196,9 @@ export declare const processingOrder: {
     "font-size": number;
     color: number;
 };
+export declare function isDefaultingValue(value: Val): boolean;
 /**
  * Function to sort property names in the order they should be processed
  */
 export declare function processingOrderFn(name1: string, name2: string): number;
+export declare function isCustomPropName(name: string): boolean;

package/lib/vivliostyle/diff.d.ts

@@ -19,14 +19,8 @@
  */
 export declare type Change = (number | string)[];
 export declare function diffChars(originalText: string, newText: string): Change[];
-/**
- * @returns string
- */
-export declare function restoreOriginalText(changes: Change[]): any;
-/**
- * @returns string
- */
-export declare function restoreNewText(changes: Change[]): any;
+export declare function restoreOriginalText(changes: Change[]): string;
+export declare function restoreNewText(changes: Change[]): string;
 export declare function resolveNewIndex(changes: Change[], oldIndex: number): number;
 export declare function resolveOriginalIndex(changes: Change[], newIndex: number): number;
 export declare function resolveIndex(changes: Change[], index: number, coef: number): number;

package/lib/vivliostyle/epub.d.ts

@@ -43,9 +43,6 @@ export declare class EPUBDocStore extends OPS.OPSDocStore {
     loadWebPub(url: string): Task.Result<OPFDoc>;
     addDocument(url: string, doc: Document): Task.Result<XmlDoc.XMLDocHolder>;
     reportLoadError(docURL: string): void;
-    /**
-     * @override
-     */
     load(url: string): Task.Result<XmlDoc.XMLDocHolder>;
 }
 export declare type OPFItemParam = {
@@ -312,9 +309,7 @@ export declare class OPFView implements Vgen.CustomRendererFactory {
         [key: string]: Css.Val;
     }): Task.Result<Element>;
     private resolveURLsInMathML;
-    /**
-     * @override
-     */
+    /** @override */
     makeCustomRenderer(xmldoc: XmlDoc.XMLDocHolder): Vgen.CustomRenderer;
     getPageViewItem(spineIndex: number): Task.Result<OPFViewItem>;
     removeRenderedPages(): void;