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.

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

Change directory structure #552

Merged
merged 2 commits into from
Oct 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
*
* @fileoverview AdaptViewer - Viewer implementation.
*/
import * as Asserts from "../vivliostyle/asserts";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Constants from "../vivliostyle/constants";
import * as Constants from "./constants";
import * as Epub from "./epub";
import * as Exprs from "./exprs";
import * as Font from "./font";
import * as Logging from "../vivliostyle/logging";
import * as Plugin from "../vivliostyle/plugin";
import * as Profile from "../vivliostyle/profile";
import * as Logging from "./logging";
import * as Plugin from "./plugin";
import * as Profile from "./profile";
import * as Task from "./task";
import * as TaskUtil from "./taskutil";
import * as Vgen from "./vgen";
Expand Down
2 changes: 1 addition & 1 deletion src/ts/adapt/base.ts → src/ts/vivliostyle/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @fileoverview Base - Common utilities.
*/
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";

export let emptyObj = {};

Expand Down
2 changes: 1 addition & 1 deletion src/ts/vivliostyle/break.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* @fileoverview Break - Control fragmentation.
*/
import * as Css from "../adapt/css";
import * as Css from "./css";
import * as Plugin from "./plugin";

/**
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ts/vivliostyle/columns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* @fileoverview Columns - Control column layout.
*/
import * as Asserts from "./asserts";
import * as Css from "../adapt/css";
import * as Css from "./css";
import * as MathUtil from "./mathutil";
import * as PageFloats from "./pagefloats";
import * as Task from "../adapt/task";
import * as Vtree from "../adapt/vtree";
import * as Task from "./task";
import * as Vtree from "./vtree";
import { Layout } from "./types";

export type ColumnLayoutResult = {
Expand Down
14 changes: 7 additions & 7 deletions src/ts/vivliostyle/counters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
* @fileoverview Counters
*/
import * as Asserts from "./asserts";
import * as Base from "../adapt/base";
import * as CssCasc from "../adapt/csscasc";
import * as CssProp from "../adapt/cssprop";
import * as CssStyler from "../adapt/cssstyler";
import * as Exprs from "../adapt/exprs";
import * as Vgen from "../adapt/vgen";
import * as Vtree from "../adapt/vtree";
import * as Base from "./base";
import * as CssCasc from "./csscasc";
import * as CssProp from "./cssprop";
import * as CssStyler from "./cssstyler";
import * as Exprs from "./exprs";
import * as Vgen from "./vgen";
import * as Vtree from "./vtree";
import { Layout } from "./types";

/**
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions src/ts/adapt/csscasc.ts → src/ts/vivliostyle/csscasc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
*
* @fileoverview CssCasc - CSS Cascade.
*/
import * as Asserts from "../vivliostyle/asserts";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Css from "./css";
import * as CssParse from "./cssparse";
import * as CssProp from "./cssprop";
import * as CssTok from "./csstok";
import * as CssValid from "./cssvalid";
import * as Exprs from "./exprs";
import * as Logging from "../vivliostyle/logging";
import * as Matchers from "../vivliostyle/matchers";
import * as Plugin from "../vivliostyle/plugin";
import * as Logging from "./logging";
import * as Matchers from "./matchers";
import * as Plugin from "./plugin";
import * as Vtree from "./vtree";
import { CssCasc } from "../vivliostyle/types";
import { CssCasc } from "./types";

export interface ElementStyle extends CssCasc.ElementStyle {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as Base from "./base";
import * as Css from "./css";
import * as CssTok from "./csstok";
import * as Exprs from "./exprs";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";
import * as Net from "./net";
import * as Task from "./task";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import * as Base from "./base";
import * as Css from "./css";
import * as Exprs from "./exprs";
import * as Geom from "./geom";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";

//---------------------- value parsers ----------------------------------
export class SetVisitor extends Css.Visitor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
* @fileoverview CssStyler - Apply CSS cascade to a document incrementally and
* cache the result.
*/
import * as Asserts from "../vivliostyle/asserts";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Break from "../vivliostyle/break";
import * as Break from "./break";
import * as Css from "./css";
import * as CssCasc from "./csscasc";
import * as CssParse from "./cssparse";
import * as CssProp from "./cssprop";
import * as CssValid from "./cssvalid";
import * as Display from "../vivliostyle/display";
import * as Display from "./display";
import * as Exprs from "./exprs";
import * as Vtree from "./vtree";
import { CssStyler, XmlDoc } from "../vivliostyle/types";
import { CssStyler, XmlDoc } from "./types";

export class SlipRange {
endStuckFixed: number;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import * as Css from "./css";
import * as CssParse from "./cssparse";
import * as CssTok from "./csstok";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";
import ValidationTxt from "../../resources/validation.txt";

export interface PropertyReceiver {
Expand Down
2 changes: 1 addition & 1 deletion src/ts/vivliostyle/display.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* @fileoverview Display - CSS Display Module
*/
import * as Css from "../adapt/css";
import * as Css from "./css";

export const FLOW_ROOT_ATTR = "data-vivliostyle-flow-root";

Expand Down
8 changes: 4 additions & 4 deletions src/ts/adapt/epub.ts → src/ts/vivliostyle/epub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
*
* @fileoverview Epub - Deal with META-INF/ and .opf files in EPUB container.
*/
import * as Asserts from "../vivliostyle/asserts";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Cfi from "./cfi";
import * as Constants from "../vivliostyle/constants";
import * as Counters from "../vivliostyle/counters";
import * as Constants from "./constants";
import * as Counters from "./counters";
import * as Css from "./css";
import * as CssCasc from "./csscasc";
import * as CssParse from "./cssparse";
import * as CssTok from "./csstok";
import * as Exprs from "./exprs";
import * as Font from "./font";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";
import * as Net from "./net";
import * as Ops from "./ops";
import * as Sha1 from "./sha1";
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ts/adapt/font.ts → src/ts/vivliostyle/font.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as Base from "./base";
import * as Css from "./css";
import * as CssCasc from "./csscasc";
import * as Exprs from "./exprs";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";
import * as Net from "./net";
import * as Task from "./task";
import * as TaskUtil from "./taskutil";
Expand Down
6 changes: 3 additions & 3 deletions src/ts/vivliostyle/footnotes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* @fileoverview Footnotes
*/
import * as Asserts from "./asserts";
import * as Css from "../adapt/css";
import * as Css from "./css";
import * as PageFloats from "./pagefloats";
import * as Task from "../adapt/task";
import * as Vtree from "../adapt/vtree";
import * as Task from "./task";
import * as Vtree from "./vtree";
import { Layout } from "./types";

const PageFloatFragment = PageFloats.PageFloatFragment;
Expand Down
File renamed without changes.
28 changes: 14 additions & 14 deletions src/ts/adapt/layout.ts → src/ts/vivliostyle/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
* Instead it goes through the layout interface that gives it one view tree
* node at a time.
*/
import * as Asserts from "../vivliostyle/asserts";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Break from "../vivliostyle/break";
import * as BreakPosition from "../vivliostyle/breakposition";
import * as Break from "./break";
import * as BreakPosition from "./breakposition";
import * as Css from "./css";
import * as Diff from "../vivliostyle/diff";
import * as Diff from "./diff";
import * as Geom from "./geom";
import * as LayoutHelper from "../vivliostyle/layouthelper";
import * as LayoutProcessor from "../vivliostyle/layoutprocessor";
import * as LayoutRetryers from "../vivliostyle/layoutretryers";
import * as Logging from "../vivliostyle/logging";
import * as PageFloats from "../vivliostyle/pagefloats";
import * as Plugin from "../vivliostyle/plugin";
import * as Selectors from "../vivliostyle/selectors";
import * as Shared from "../vivliostyle/shared";
import * as Sizing from "../vivliostyle/sizing";
import * as LayoutHelper from "./layouthelper";
import * as LayoutProcessor from "./layoutprocessor";
import * as LayoutRetryers from "./layoutretryers";
import * as Logging from "./logging";
import * as PageFloats from "./pagefloats";
import * as Plugin from "./plugin";
import * as Selectors from "./selectors";
import * as Shared from "./shared";
import * as Sizing from "./sizing";
import * as Task from "./task";
import * as Vgen from "./vgen";
import * as VtreeImpl from "./vtree";
import { Layout, RepetitiveElement, Table, Vtree } from "../vivliostyle/types";
import { Layout, RepetitiveElement, Table, Vtree } from "./types";

export const mediaTags = {
img: true,
Expand Down
4 changes: 2 additions & 2 deletions src/ts/vivliostyle/layouthelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*
* @fileoverview LayoutHelper - Helper functions of Layout.
*/
import * as Base from "../adapt/base";
import * as Base from "./base";
import * as Logging from "./logging";
import * as VtreeImpl from "../adapt/vtree";
import * as VtreeImpl from "./vtree";
import { Layout, Vtree } from "./types";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/ts/vivliostyle/layoutprocessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import * as BreakPosition from "./breakposition";
import * as Display from "./display";
import * as LayoutHelper from "./layouthelper";
import * as Plugin from "./plugin";
import * as Task from "../adapt/task";
import * as Task from "./task";
import { FormattingContextType, Layout, LayoutProcessor, Vtree } from "./types";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/ts/vivliostyle/layoutretryers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @fileoverview LayoutRetryers - Definitions of LayoutRetryer.
*/
import * as Asserts from "./asserts";
import * as Task from "../adapt/task";
import * as Task from "./task";
import { Layout, Vtree } from "./types";

/**
Expand Down
6 changes: 3 additions & 3 deletions src/ts/vivliostyle/layoututil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
*/
import * as Break from "./break";
import * as BreakPosition from "./breakposition";
import * as LayoutImpl from "../adapt/layout";
import * as Task from "../adapt/task";
import * as VtreeImpl from "../adapt/vtree";
import * as LayoutImpl from "./layout";
import * as Task from "./task";
import * as VtreeImpl from "./vtree";
import { Layout, Vtree } from "./types";

export type LayoutIteratorState = {
Expand Down
4 changes: 2 additions & 2 deletions src/ts/adapt/net.ts → src/ts/vivliostyle/net.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
* @fileoverview Net - Fetch resource from a URL.
*/
import * as Base from "./base";
import * as Logging from "../vivliostyle/logging";
import * as Logging from "./logging";
import * as Task from "./task";
import * as TaskUtil from "./taskutil";
import { Net, XmlDoc } from "../vivliostyle/types";
import { Net, XmlDoc } from "./types";
import UserAgentXml from "../../resources/user-agent.xml";

/**
Expand Down
26 changes: 13 additions & 13 deletions src/ts/adapt/ops.ts → src/ts/vivliostyle/ops.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
* @fileoverview Ops - Render EPUB content files by applying page masters,
* styling and layout.
*/
import "../vivliostyle/footnotes";
import "../vivliostyle/table";
import * as Asserts from "../vivliostyle/asserts";
import "./footnotes";
import "./table";
import * as Asserts from "./asserts";
import * as Base from "./base";
import * as Break from "../vivliostyle/break";
import * as Columns from "../vivliostyle/columns";
import * as Constants from "../vivliostyle/constants";
import * as Counters from "../vivliostyle/counters";
import * as Break from "./break";
import * as Columns from "./columns";
import * as Constants from "./constants";
import * as Counters from "./counters";
import * as Css from "./css";
import * as CssCasc from "./csscasc";
import * as CssParse from "./cssparse";
Expand All @@ -38,19 +38,19 @@ import * as Exprs from "./exprs";
import * as Font from "./font";
import * as Geom from "./geom";
import * as LayoutImpl from "./layout";
import * as LayoutProcessor from "../vivliostyle/layoutprocessor";
import * as Logging from "../vivliostyle/logging";
import * as LayoutProcessor from "./layoutprocessor";
import * as Logging from "./logging";
import * as Net from "./net";
import * as PageFloats from "../vivliostyle/pagefloats";
import * as Pages from "../vivliostyle/pages";
import * as Plugin from "../vivliostyle/plugin";
import * as PageFloats from "./pagefloats";
import * as Pages from "./pages";
import * as Plugin from "./plugin";
import * as Pm from "./pm";
import * as Task from "./task";
import * as TaskUtil from "./taskutil";
import * as Vgen from "./vgen";
import * as Vtree from "./vtree";
import * as XmlDoc from "./xmldoc";
import { Layout } from "../vivliostyle/types";
import { Layout } from "./types";
import UserAgentBaseCss from "../../resources/user-agent-base.css";
import UserAgentPageCss from "../../resources/user-agent-page.css";

Expand Down
8 changes: 4 additions & 4 deletions src/ts/vivliostyle/pagefloats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
* @fileoverview PageFloats - CSS Page Floats
*/
import * as Asserts from "./asserts";
import * as Css from "../adapt/css";
import * as Geom from "../adapt/geom";
import * as Css from "./css";
import * as Geom from "./geom";
import * as Logging from "./logging";
import * as Logical from "./logical";
import * as Sizing from "./sizing";
import * as Task from "../adapt/task";
import * as VtreeImpl from "../adapt/vtree";
import * as Task from "./task";
import * as VtreeImpl from "./vtree";
import { Layout, PageFloats, Vtree } from "./types";

export const FloatReference = PageFloats.FloatReference;
Expand Down
18 changes: 9 additions & 9 deletions src/ts/vivliostyle/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
* @fileoverview Pages - `@page` rule (CSS Paged Media) support
*/
import * as Asserts from "./asserts";
import * as Base from "../adapt/base";
import * as Base from "./base";
import * as Constants from "./constants";
import * as Css from "../adapt/css";
import * as CssCasc from "../adapt/csscasc";
import * as CssParse from "../adapt/cssparse";
import * as CssValid from "../adapt/cssvalid";
import * as Exprs from "../adapt/exprs";
import * as Font from "../adapt/font";
import * as Pm from "../adapt/pm";
import * as Css from "./css";
import * as CssCasc from "./csscasc";
import * as CssParse from "./cssparse";
import * as CssValid from "./cssvalid";
import * as Exprs from "./exprs";
import * as Font from "./font";
import * as Pm from "./pm";
import * as Sizing from "./sizing";
import * as Vtree from "../adapt/vtree";
import * as Vtree from "./vtree";

/**
* Resolve page progression direction from writing-mode and direction.
Expand Down
Loading