diff --git a/core/src/PdfParser.ts b/core/src/PdfParser.ts index 0f68783..40db2a8 100644 --- a/core/src/PdfParser.ts +++ b/core/src/PdfParser.ts @@ -9,7 +9,7 @@ import ParseResult from './ParseResult'; export default class PdfParser { pdfjs: any; defaultParams: object; - schema = ['transform', 'str', 'fontName', 'dir', 'width', 'height']; + schema = ['transform', 'width', 'height', 'str', 'fontName', 'dir']; constructor(pdfjs: any, defaultParams = {}) { this.pdfjs = pdfjs; diff --git a/core/src/transformer/RemoveRepetitiveItems.ts b/core/src/transformer/RemoveRepetitiveItems.ts index cddfb54..43fff03 100644 --- a/core/src/transformer/RemoveRepetitiveItems.ts +++ b/core/src/transformer/RemoveRepetitiveItems.ts @@ -43,7 +43,6 @@ export default class RemoveRepetitiveItems extends ItemTransformer { transform(context: TransformContext, inputItems: Item[]): ItemResult { const minY = context.getGlobal(MIN_Y); const maxY = context.getGlobal(MAX_Y); - const pageMapping = context.getGlobal(PAGE_MAPPING); const bottomMaxY = minY + config.maxDistanceFromFringeElements; const topMinY = maxY - config.maxDistanceFromFringeElements; // console.log('bottomMaxY', bottomMaxY, 'topMinY', topMinY); diff --git a/examples/Adventures-Of-Sherlock-Holmes/adjustHeights.json b/examples/Adventures-Of-Sherlock-Holmes/adjustHeights.json index 95d0402..9289b24 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/adjustHeights.json +++ b/examples/Adventures-Of-Sherlock-Holmes/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Adventures-Of-Sherlock-Holmes/calculateStatistics.json b/examples/Adventures-Of-Sherlock-Holmes/calculateStatistics.json index b4babd6..ce788f4 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/calculateStatistics.json +++ b/examples/Adventures-Of-Sherlock-Holmes/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Adventures-Of-Sherlock-Holmes/compactLines.json b/examples/Adventures-Of-Sherlock-Holmes/compactLines.json index c1f9521..79aa7c0 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/compactLines.json +++ b/examples/Adventures-Of-Sherlock-Holmes/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Adventures-Of-Sherlock-Holmes/removeEmptyItems.json b/examples/Adventures-Of-Sherlock-Holmes/removeEmptyItems.json index eecde35..77b0db9 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/removeEmptyItems.json +++ b/examples/Adventures-Of-Sherlock-Holmes/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Adventures-Of-Sherlock-Holmes/removeRepetitiveItems.json b/examples/Adventures-Of-Sherlock-Holmes/removeRepetitiveItems.json index e505e8b..c68f50a 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/removeRepetitiveItems.json +++ b/examples/Adventures-Of-Sherlock-Holmes/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Adventures-Of-Sherlock-Holmes/sortbyX.json b/examples/Adventures-Of-Sherlock-Holmes/sortbyX.json index 0749a91..14ef5f7 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/sortbyX.json +++ b/examples/Adventures-Of-Sherlock-Holmes/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Adventures-Of-Sherlock-Holmes/unwrapCoordinates.json b/examples/Adventures-Of-Sherlock-Holmes/unwrapCoordinates.json index bb2244a..8ccb44f 100644 --- a/examples/Adventures-Of-Sherlock-Holmes/unwrapCoordinates.json +++ b/examples/Adventures-Of-Sherlock-Holmes/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Alice-In-Wonderland/adjustHeights.json b/examples/Alice-In-Wonderland/adjustHeights.json index 7f90a42..dc736a8 100644 --- a/examples/Alice-In-Wonderland/adjustHeights.json +++ b/examples/Alice-In-Wonderland/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Alice-In-Wonderland/calculateStatistics.json b/examples/Alice-In-Wonderland/calculateStatistics.json index e28189d..ab4b7e6 100644 --- a/examples/Alice-In-Wonderland/calculateStatistics.json +++ b/examples/Alice-In-Wonderland/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Alice-In-Wonderland/compactLines.json b/examples/Alice-In-Wonderland/compactLines.json index 3b3af8e..5fd3782 100644 --- a/examples/Alice-In-Wonderland/compactLines.json +++ b/examples/Alice-In-Wonderland/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Alice-In-Wonderland/removeEmptyItems.json b/examples/Alice-In-Wonderland/removeEmptyItems.json index 6b3b803..5a6d587 100644 --- a/examples/Alice-In-Wonderland/removeEmptyItems.json +++ b/examples/Alice-In-Wonderland/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Alice-In-Wonderland/removeRepetitiveItems.json b/examples/Alice-In-Wonderland/removeRepetitiveItems.json index 3cd5a7d..5a238e3 100644 --- a/examples/Alice-In-Wonderland/removeRepetitiveItems.json +++ b/examples/Alice-In-Wonderland/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Alice-In-Wonderland/sortbyX.json b/examples/Alice-In-Wonderland/sortbyX.json index 3ef2f12..3554739 100644 --- a/examples/Alice-In-Wonderland/sortbyX.json +++ b/examples/Alice-In-Wonderland/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Alice-In-Wonderland/unwrapCoordinates.json b/examples/Alice-In-Wonderland/unwrapCoordinates.json index 524fd84..92b88b6 100644 --- a/examples/Alice-In-Wonderland/unwrapCoordinates.json +++ b/examples/Alice-In-Wonderland/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Closed-Syllables/adjustHeights.json b/examples/Closed-Syllables/adjustHeights.json index a85b0d3..9055d9c 100644 --- a/examples/Closed-Syllables/adjustHeights.json +++ b/examples/Closed-Syllables/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Closed-Syllables/calculateStatistics.json b/examples/Closed-Syllables/calculateStatistics.json index c502ee6..7b912f2 100644 --- a/examples/Closed-Syllables/calculateStatistics.json +++ b/examples/Closed-Syllables/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Closed-Syllables/compactLines.json b/examples/Closed-Syllables/compactLines.json index d11704a..ccefee6 100644 --- a/examples/Closed-Syllables/compactLines.json +++ b/examples/Closed-Syllables/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Closed-Syllables/removeEmptyItems.json b/examples/Closed-Syllables/removeEmptyItems.json index 67e8812..f00f4cd 100644 --- a/examples/Closed-Syllables/removeEmptyItems.json +++ b/examples/Closed-Syllables/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Closed-Syllables/removeRepetitiveItems.json b/examples/Closed-Syllables/removeRepetitiveItems.json index a1793a8..83d8489 100644 --- a/examples/Closed-Syllables/removeRepetitiveItems.json +++ b/examples/Closed-Syllables/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Closed-Syllables/sortbyX.json b/examples/Closed-Syllables/sortbyX.json index 5702205..30b0718 100644 --- a/examples/Closed-Syllables/sortbyX.json +++ b/examples/Closed-Syllables/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Closed-Syllables/unwrapCoordinates.json b/examples/Closed-Syllables/unwrapCoordinates.json index 99eba0c..a792bc2 100644 --- a/examples/Closed-Syllables/unwrapCoordinates.json +++ b/examples/Closed-Syllables/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/ExamplePdf/adjustHeights.json b/examples/ExamplePdf/adjustHeights.json index 2580a9e..013b73c 100644 --- a/examples/ExamplePdf/adjustHeights.json +++ b/examples/ExamplePdf/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/ExamplePdf/calculateStatistics.json b/examples/ExamplePdf/calculateStatistics.json index ca9c765..b12dd84 100644 --- a/examples/ExamplePdf/calculateStatistics.json +++ b/examples/ExamplePdf/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/ExamplePdf/compactLines.json b/examples/ExamplePdf/compactLines.json index c041d37..77d3e5c 100644 --- a/examples/ExamplePdf/compactLines.json +++ b/examples/ExamplePdf/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/ExamplePdf/removeEmptyItems.json b/examples/ExamplePdf/removeEmptyItems.json index 7133aa1..8dd19fa 100644 --- a/examples/ExamplePdf/removeEmptyItems.json +++ b/examples/ExamplePdf/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/ExamplePdf/removeRepetitiveItems.json b/examples/ExamplePdf/removeRepetitiveItems.json index 721e54f..1cd1102 100644 --- a/examples/ExamplePdf/removeRepetitiveItems.json +++ b/examples/ExamplePdf/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/ExamplePdf/sortbyX.json b/examples/ExamplePdf/sortbyX.json index dd48d3b..40db82b 100644 --- a/examples/ExamplePdf/sortbyX.json +++ b/examples/ExamplePdf/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/ExamplePdf/unwrapCoordinates.json b/examples/ExamplePdf/unwrapCoordinates.json index 53a52d5..6e16c5a 100644 --- a/examples/ExamplePdf/unwrapCoordinates.json +++ b/examples/ExamplePdf/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Flash-Masques-Temperature/adjustHeights.json b/examples/Flash-Masques-Temperature/adjustHeights.json index 8a19ec3..93de776 100644 --- a/examples/Flash-Masques-Temperature/adjustHeights.json +++ b/examples/Flash-Masques-Temperature/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Flash-Masques-Temperature/calculateStatistics.json b/examples/Flash-Masques-Temperature/calculateStatistics.json index 420fda6..5c0d243 100644 --- a/examples/Flash-Masques-Temperature/calculateStatistics.json +++ b/examples/Flash-Masques-Temperature/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Flash-Masques-Temperature/compactLines.json b/examples/Flash-Masques-Temperature/compactLines.json index 143b4df..d787573 100644 --- a/examples/Flash-Masques-Temperature/compactLines.json +++ b/examples/Flash-Masques-Temperature/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Flash-Masques-Temperature/removeEmptyItems.json b/examples/Flash-Masques-Temperature/removeEmptyItems.json index bff6865..3cbc31d 100644 --- a/examples/Flash-Masques-Temperature/removeEmptyItems.json +++ b/examples/Flash-Masques-Temperature/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Flash-Masques-Temperature/removeRepetitiveItems.json b/examples/Flash-Masques-Temperature/removeRepetitiveItems.json index 6615534..0531ba3 100644 --- a/examples/Flash-Masques-Temperature/removeRepetitiveItems.json +++ b/examples/Flash-Masques-Temperature/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Flash-Masques-Temperature/sortbyX.json b/examples/Flash-Masques-Temperature/sortbyX.json index 3680966..07f9c66 100644 --- a/examples/Flash-Masques-Temperature/sortbyX.json +++ b/examples/Flash-Masques-Temperature/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Flash-Masques-Temperature/unwrapCoordinates.json b/examples/Flash-Masques-Temperature/unwrapCoordinates.json index 7cf631b..e5c6334 100644 --- a/examples/Flash-Masques-Temperature/unwrapCoordinates.json +++ b/examples/Flash-Masques-Temperature/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Grammar-Matters/adjustHeights.json b/examples/Grammar-Matters/adjustHeights.json index b3c43a7..761f5bc 100644 --- a/examples/Grammar-Matters/adjustHeights.json +++ b/examples/Grammar-Matters/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Grammar-Matters/calculateStatistics.json b/examples/Grammar-Matters/calculateStatistics.json index 8874871..beef961 100644 --- a/examples/Grammar-Matters/calculateStatistics.json +++ b/examples/Grammar-Matters/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Grammar-Matters/compactLines.json b/examples/Grammar-Matters/compactLines.json index 731e6d8..57c7f9c 100644 --- a/examples/Grammar-Matters/compactLines.json +++ b/examples/Grammar-Matters/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Grammar-Matters/removeEmptyItems.json b/examples/Grammar-Matters/removeEmptyItems.json index 1a6028b..da953fe 100644 --- a/examples/Grammar-Matters/removeEmptyItems.json +++ b/examples/Grammar-Matters/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Grammar-Matters/removeRepetitiveItems.json b/examples/Grammar-Matters/removeRepetitiveItems.json index 6ab3e96..0ba3895 100644 --- a/examples/Grammar-Matters/removeRepetitiveItems.json +++ b/examples/Grammar-Matters/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Grammar-Matters/sortbyX.json b/examples/Grammar-Matters/sortbyX.json index b598e16..2b2e8be 100644 --- a/examples/Grammar-Matters/sortbyX.json +++ b/examples/Grammar-Matters/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Grammar-Matters/unwrapCoordinates.json b/examples/Grammar-Matters/unwrapCoordinates.json index eab10f1..07575db 100644 --- a/examples/Grammar-Matters/unwrapCoordinates.json +++ b/examples/Grammar-Matters/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Life-Of-God-In-Soul-Of-Man/adjustHeights.json b/examples/Life-Of-God-In-Soul-Of-Man/adjustHeights.json index ba622b1..027c79a 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/adjustHeights.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Life-Of-God-In-Soul-Of-Man/calculateStatistics.json b/examples/Life-Of-God-In-Soul-Of-Man/calculateStatistics.json index ec5406d..daa4a9e 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/calculateStatistics.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Life-Of-God-In-Soul-Of-Man/compactLines.json b/examples/Life-Of-God-In-Soul-Of-Man/compactLines.json index 6c61cc7..add9d63 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/compactLines.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Life-Of-God-In-Soul-Of-Man/removeEmptyItems.json b/examples/Life-Of-God-In-Soul-Of-Man/removeEmptyItems.json index 2076a79..3443b2a 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/removeEmptyItems.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Life-Of-God-In-Soul-Of-Man/removeRepetitiveItems.json b/examples/Life-Of-God-In-Soul-Of-Man/removeRepetitiveItems.json index 3347f8e..50ef185 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/removeRepetitiveItems.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Life-Of-God-In-Soul-Of-Man/sortbyX.json b/examples/Life-Of-God-In-Soul-Of-Man/sortbyX.json index 92ea5d2..671907f 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/sortbyX.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Life-Of-God-In-Soul-Of-Man/unwrapCoordinates.json b/examples/Life-Of-God-In-Soul-Of-Man/unwrapCoordinates.json index 6aec0da..5fe165a 100644 --- a/examples/Life-Of-God-In-Soul-Of-Man/unwrapCoordinates.json +++ b/examples/Life-Of-God-In-Soul-Of-Man/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Safe-Communication/adjustHeights.json b/examples/Safe-Communication/adjustHeights.json index 4a6a1f5..2bb3e04 100644 --- a/examples/Safe-Communication/adjustHeights.json +++ b/examples/Safe-Communication/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Safe-Communication/calculateStatistics.json b/examples/Safe-Communication/calculateStatistics.json index 2aabc4e..1c6e121 100644 --- a/examples/Safe-Communication/calculateStatistics.json +++ b/examples/Safe-Communication/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Safe-Communication/compactLines.json b/examples/Safe-Communication/compactLines.json index 5dee884..b1bbc4e 100644 --- a/examples/Safe-Communication/compactLines.json +++ b/examples/Safe-Communication/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Safe-Communication/removeEmptyItems.json b/examples/Safe-Communication/removeEmptyItems.json index 81212bd..745695e 100644 --- a/examples/Safe-Communication/removeEmptyItems.json +++ b/examples/Safe-Communication/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Safe-Communication/removeRepetitiveItems.json b/examples/Safe-Communication/removeRepetitiveItems.json index 1213a83..58e1bd5 100644 --- a/examples/Safe-Communication/removeRepetitiveItems.json +++ b/examples/Safe-Communication/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Safe-Communication/sortbyX.json b/examples/Safe-Communication/sortbyX.json index 43829ef..fccb4cd 100644 --- a/examples/Safe-Communication/sortbyX.json +++ b/examples/Safe-Communication/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Safe-Communication/unwrapCoordinates.json b/examples/Safe-Communication/unwrapCoordinates.json index 16fb472..b92949e 100644 --- a/examples/Safe-Communication/unwrapCoordinates.json +++ b/examples/Safe-Communication/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/St-Mary-Witney-Social-Audit/adjustHeights.json b/examples/St-Mary-Witney-Social-Audit/adjustHeights.json index 631f19f..2027529 100644 --- a/examples/St-Mary-Witney-Social-Audit/adjustHeights.json +++ b/examples/St-Mary-Witney-Social-Audit/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/St-Mary-Witney-Social-Audit/calculateStatistics.json b/examples/St-Mary-Witney-Social-Audit/calculateStatistics.json index cbef911..131ff28 100644 --- a/examples/St-Mary-Witney-Social-Audit/calculateStatistics.json +++ b/examples/St-Mary-Witney-Social-Audit/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/St-Mary-Witney-Social-Audit/compactLines.json b/examples/St-Mary-Witney-Social-Audit/compactLines.json index 569b6b8..ab86fa9 100644 --- a/examples/St-Mary-Witney-Social-Audit/compactLines.json +++ b/examples/St-Mary-Witney-Social-Audit/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/St-Mary-Witney-Social-Audit/removeEmptyItems.json b/examples/St-Mary-Witney-Social-Audit/removeEmptyItems.json index b88d19f..b7b88f8 100644 --- a/examples/St-Mary-Witney-Social-Audit/removeEmptyItems.json +++ b/examples/St-Mary-Witney-Social-Audit/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/St-Mary-Witney-Social-Audit/removeRepetitiveItems.json b/examples/St-Mary-Witney-Social-Audit/removeRepetitiveItems.json index 2c3fce7..f75f48a 100644 --- a/examples/St-Mary-Witney-Social-Audit/removeRepetitiveItems.json +++ b/examples/St-Mary-Witney-Social-Audit/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/St-Mary-Witney-Social-Audit/sortbyX.json b/examples/St-Mary-Witney-Social-Audit/sortbyX.json index 7eeb79d..6091fd5 100644 --- a/examples/St-Mary-Witney-Social-Audit/sortbyX.json +++ b/examples/St-Mary-Witney-Social-Audit/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/St-Mary-Witney-Social-Audit/unwrapCoordinates.json b/examples/St-Mary-Witney-Social-Audit/unwrapCoordinates.json index 47d075d..466b774 100644 --- a/examples/St-Mary-Witney-Social-Audit/unwrapCoordinates.json +++ b/examples/St-Mary-Witney-Social-Audit/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Art-of-Public-Speaking/adjustHeights.json b/examples/The-Art-of-Public-Speaking/adjustHeights.json index a116319..bd18b62 100644 --- a/examples/The-Art-of-Public-Speaking/adjustHeights.json +++ b/examples/The-Art-of-Public-Speaking/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Art-of-Public-Speaking/calculateStatistics.0.json b/examples/The-Art-of-Public-Speaking/calculateStatistics.0.json index f058476..ba8d3e6 100644 --- a/examples/The-Art-of-Public-Speaking/calculateStatistics.0.json +++ b/examples/The-Art-of-Public-Speaking/calculateStatistics.0.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Art-of-Public-Speaking/compactLines.json b/examples/The-Art-of-Public-Speaking/compactLines.json index f62b49e..d6e321b 100644 --- a/examples/The-Art-of-Public-Speaking/compactLines.json +++ b/examples/The-Art-of-Public-Speaking/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Art-of-Public-Speaking/removeEmptyItems.json b/examples/The-Art-of-Public-Speaking/removeEmptyItems.json index 83cc981..ec894bb 100644 --- a/examples/The-Art-of-Public-Speaking/removeEmptyItems.json +++ b/examples/The-Art-of-Public-Speaking/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Art-of-Public-Speaking/removeRepetitiveItems.json b/examples/The-Art-of-Public-Speaking/removeRepetitiveItems.json index 249003f..6e72476 100644 --- a/examples/The-Art-of-Public-Speaking/removeRepetitiveItems.json +++ b/examples/The-Art-of-Public-Speaking/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Art-of-Public-Speaking/sortbyX.json b/examples/The-Art-of-Public-Speaking/sortbyX.json index fea1aa5..c77eebd 100644 --- a/examples/The-Art-of-Public-Speaking/sortbyX.json +++ b/examples/The-Art-of-Public-Speaking/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Art-of-Public-Speaking/unwrapCoordinates.0.json b/examples/The-Art-of-Public-Speaking/unwrapCoordinates.0.json index f2582b3..02922b0 100644 --- a/examples/The-Art-of-Public-Speaking/unwrapCoordinates.0.json +++ b/examples/The-Art-of-Public-Speaking/unwrapCoordinates.0.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Man-Without-A-Body/adjustHeights.json b/examples/The-Man-Without-A-Body/adjustHeights.json index 26ce226..d53977d 100644 --- a/examples/The-Man-Without-A-Body/adjustHeights.json +++ b/examples/The-Man-Without-A-Body/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Man-Without-A-Body/calculateStatistics.json b/examples/The-Man-Without-A-Body/calculateStatistics.json index 8b6d4e2..950f342 100644 --- a/examples/The-Man-Without-A-Body/calculateStatistics.json +++ b/examples/The-Man-Without-A-Body/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Man-Without-A-Body/compactLines.json b/examples/The-Man-Without-A-Body/compactLines.json index e57bdb2..47c522b 100644 --- a/examples/The-Man-Without-A-Body/compactLines.json +++ b/examples/The-Man-Without-A-Body/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Man-Without-A-Body/removeEmptyItems.json b/examples/The-Man-Without-A-Body/removeEmptyItems.json index f7ac80b..10b98be 100644 --- a/examples/The-Man-Without-A-Body/removeEmptyItems.json +++ b/examples/The-Man-Without-A-Body/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-Man-Without-A-Body/removeRepetitiveItems.json b/examples/The-Man-Without-A-Body/removeRepetitiveItems.json index 19f1c4d..1ff6eab 100644 --- a/examples/The-Man-Without-A-Body/removeRepetitiveItems.json +++ b/examples/The-Man-Without-A-Body/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Man-Without-A-Body/sortbyX.json b/examples/The-Man-Without-A-Body/sortbyX.json index 19f1c4d..1ff6eab 100644 --- a/examples/The-Man-Without-A-Body/sortbyX.json +++ b/examples/The-Man-Without-A-Body/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-Man-Without-A-Body/unwrapCoordinates.json b/examples/The-Man-Without-A-Body/unwrapCoordinates.json index 82bbb68..d7161e7 100644 --- a/examples/The-Man-Without-A-Body/unwrapCoordinates.json +++ b/examples/The-Man-Without-A-Body/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-War-of-the-Worlds/adjustHeights.json b/examples/The-War-of-the-Worlds/adjustHeights.json index 4f8d6a6..4d8e969 100644 --- a/examples/The-War-of-the-Worlds/adjustHeights.json +++ b/examples/The-War-of-the-Worlds/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-War-of-the-Worlds/calculateStatistics.json b/examples/The-War-of-the-Worlds/calculateStatistics.json index 56fa763..13df7c9 100644 --- a/examples/The-War-of-the-Worlds/calculateStatistics.json +++ b/examples/The-War-of-the-Worlds/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-War-of-the-Worlds/compactLines.json b/examples/The-War-of-the-Worlds/compactLines.json index 73c0a4e..1cd6298 100644 --- a/examples/The-War-of-the-Worlds/compactLines.json +++ b/examples/The-War-of-the-Worlds/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-War-of-the-Worlds/removeEmptyItems.json b/examples/The-War-of-the-Worlds/removeEmptyItems.json index fe7c7b6..1e1c753 100644 --- a/examples/The-War-of-the-Worlds/removeEmptyItems.json +++ b/examples/The-War-of-the-Worlds/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/The-War-of-the-Worlds/removeRepetitiveItems.json b/examples/The-War-of-the-Worlds/removeRepetitiveItems.json index dbf5d88..5f1fff9 100644 --- a/examples/The-War-of-the-Worlds/removeRepetitiveItems.json +++ b/examples/The-War-of-the-Worlds/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-War-of-the-Worlds/sortbyX.json b/examples/The-War-of-the-Worlds/sortbyX.json index 064ea55..a9b61fc 100644 --- a/examples/The-War-of-the-Worlds/sortbyX.json +++ b/examples/The-War-of-the-Worlds/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/The-War-of-the-Worlds/unwrapCoordinates.json b/examples/The-War-of-the-Worlds/unwrapCoordinates.json index cedd2ec..10ec8b5 100644 --- a/examples/The-War-of-the-Worlds/unwrapCoordinates.json +++ b/examples/The-War-of-the-Worlds/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Tragedy-Of-The-Commons/adjustHeights.json b/examples/Tragedy-Of-The-Commons/adjustHeights.json index 2c23bfb..2b6f7f3 100644 --- a/examples/Tragedy-Of-The-Commons/adjustHeights.json +++ b/examples/Tragedy-Of-The-Commons/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Tragedy-Of-The-Commons/calculateStatistics.json b/examples/Tragedy-Of-The-Commons/calculateStatistics.json index c04f2d7..6eabc8a 100644 --- a/examples/Tragedy-Of-The-Commons/calculateStatistics.json +++ b/examples/Tragedy-Of-The-Commons/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Tragedy-Of-The-Commons/compactLines.json b/examples/Tragedy-Of-The-Commons/compactLines.json index 20038d6..ae319e0 100644 --- a/examples/Tragedy-Of-The-Commons/compactLines.json +++ b/examples/Tragedy-Of-The-Commons/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Tragedy-Of-The-Commons/removeEmptyItems.json b/examples/Tragedy-Of-The-Commons/removeEmptyItems.json index cef2dd9..31c26e0 100644 --- a/examples/Tragedy-Of-The-Commons/removeEmptyItems.json +++ b/examples/Tragedy-Of-The-Commons/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/Tragedy-Of-The-Commons/removeRepetitiveItems.json b/examples/Tragedy-Of-The-Commons/removeRepetitiveItems.json index e80c1f6..9217701 100644 --- a/examples/Tragedy-Of-The-Commons/removeRepetitiveItems.json +++ b/examples/Tragedy-Of-The-Commons/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Tragedy-Of-The-Commons/sortbyX.json b/examples/Tragedy-Of-The-Commons/sortbyX.json index 1dde9c3..39cb517 100644 --- a/examples/Tragedy-Of-The-Commons/sortbyX.json +++ b/examples/Tragedy-Of-The-Commons/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/Tragedy-Of-The-Commons/unwrapCoordinates.json b/examples/Tragedy-Of-The-Commons/unwrapCoordinates.json index 6411a9f..a8ca00c 100644 --- a/examples/Tragedy-Of-The-Commons/unwrapCoordinates.json +++ b/examples/Tragedy-Of-The-Commons/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/WoodUp/adjustHeights.json b/examples/WoodUp/adjustHeights.json index 1a42662..e9d2bdd 100644 --- a/examples/WoodUp/adjustHeights.json +++ b/examples/WoodUp/adjustHeights.json @@ -7,6 +7,12 @@ { "name": "transform" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -15,12 +21,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/WoodUp/calculateStatistics.json b/examples/WoodUp/calculateStatistics.json index cc8d462..c407ba3 100644 --- a/examples/WoodUp/calculateStatistics.json +++ b/examples/WoodUp/calculateStatistics.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/WoodUp/compactLines.json b/examples/WoodUp/compactLines.json index eb77aa8..599df3d 100644 --- a/examples/WoodUp/compactLines.json +++ b/examples/WoodUp/compactLines.json @@ -14,6 +14,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -22,12 +28,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/WoodUp/removeEmptyItems.json b/examples/WoodUp/removeEmptyItems.json index dcbaece..f372514 100644 --- a/examples/WoodUp/removeEmptyItems.json +++ b/examples/WoodUp/removeEmptyItems.json @@ -10,6 +10,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -18,12 +24,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/WoodUp/removeRepetitiveItems.json b/examples/WoodUp/removeRepetitiveItems.json index 43da192..5b9069f 100644 --- a/examples/WoodUp/removeRepetitiveItems.json +++ b/examples/WoodUp/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/WoodUp/sortbyX.json b/examples/WoodUp/sortbyX.json index dd08d20..30d15b7 100644 --- a/examples/WoodUp/sortbyX.json +++ b/examples/WoodUp/sortbyX.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/WoodUp/unwrapCoordinates.json b/examples/WoodUp/unwrapCoordinates.json index 480804c..0c82486 100644 --- a/examples/WoodUp/unwrapCoordinates.json +++ b/examples/WoodUp/unwrapCoordinates.json @@ -16,6 +16,12 @@ "name": "y", "annotation": "ADDED" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -24,12 +30,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": {} diff --git a/examples/compressed.tracemonkey-pldi-09/removeRepetitiveItems.json b/examples/compressed.tracemonkey-pldi-09/removeRepetitiveItems.json index 9ca213e..be2b014 100644 --- a/examples/compressed.tracemonkey-pldi-09/removeRepetitiveItems.json +++ b/examples/compressed.tracemonkey-pldi-09/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/examples/dict/removeRepetitiveItems.json b/examples/dict/removeRepetitiveItems.json index 1852a73..d9e8318 100644 --- a/examples/dict/removeRepetitiveItems.json +++ b/examples/dict/removeRepetitiveItems.json @@ -13,6 +13,12 @@ { "name": "y" }, + { + "name": "width" + }, + { + "name": "height" + }, { "name": "str" }, @@ -21,12 +27,6 @@ }, { "name": "dir" - }, - { - "name": "width" - }, - { - "name": "height" } ], "globals": { diff --git a/ui/src/debug/ItemRow.svelte b/ui/src/debug/ItemRow.svelte index 5c97c64..8726862 100644 --- a/ui/src/debug/ItemRow.svelte +++ b/ui/src/debug/ItemRow.svelte @@ -1,8 +1,6 @@