From 6c2051e3b9d0391ae4f27930ac2561d739582e4a Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 21 Mar 2019 10:59:22 +0300 Subject: [PATCH 1/2] Change scripts collection --- apps/documenteditor/sdk_dev_scripts.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js index a63161976..cff9812c4 100644 --- a/apps/documenteditor/sdk_dev_scripts.js +++ b/apps/documenteditor/sdk_dev_scripts.js @@ -16,16 +16,15 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", - "../../../../sdkjs/common/FontsFreeType/font_engine.js", - "../../../../sdkjs/common/FontsFreeType/FontFile.js", - "../../../../sdkjs/common/FontsFreeType/font_map.js", - "../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js", - "../../../../sdkjs/common/FontsFreeType/GlyphString.js", - "../../../../sdkjs/common/FontsFreeType/FontManager.js", - "../../../../sdkjs/common/FontsFreeType/FontClassification.js", - "../../../../sdkjs/common/FontsFreeType/character.js", + "../../../../sdkjs/common/libfont/loader.js", + "../../../../sdkjs/common/libfont/manager.js", + "../../../../sdkjs/common/libfont/map.js", + "../../../../sdkjs/common/libfont/rasterheap.js", + "../../../../sdkjs/common/libfont/glyphstring.js", + "../../../../sdkjs/common/libfont/classification.js", + "../../../../sdkjs/common/libfont/character.js", "../../../../sdkjs/common/Drawings/Metafile.js", - "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js", + "../../../../sdkjs/common/libfont/textmeasurer.js", "../../../../sdkjs/common/Drawings/WorkEvents.js", "../../../../sdkjs/word/Editor/History.js", "../../../../sdkjs/common/Shapes/EditorSettings.js", From d1a1711886dfe3363c87cb64c9f6d291a0eeac6e Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 21 Mar 2019 11:27:16 +0300 Subject: [PATCH 2/2] Change scripts collection --- apps/presentationeditor/sdk_dev_scripts.js | 17 ++++++++--------- apps/spreadsheeteditor/sdk_dev_scripts.js | 19 +++++++++---------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js index 6c7336b75..6d89b8bd3 100644 --- a/apps/presentationeditor/sdk_dev_scripts.js +++ b/apps/presentationeditor/sdk_dev_scripts.js @@ -16,16 +16,15 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", - "../../../../sdkjs/common/FontsFreeType/font_engine.js", - "../../../../sdkjs/common/FontsFreeType/FontFile.js", - "../../../../sdkjs/common/FontsFreeType/font_map.js", - "../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js", - "../../../../sdkjs/common/FontsFreeType/GlyphString.js", - "../../../../sdkjs/common/FontsFreeType/FontManager.js", - "../../../../sdkjs/common/FontsFreeType/FontClassification.js", - "../../../../sdkjs/common/FontsFreeType/character.js", + "../../../../sdkjs/common/libfont/loader.js", + "../../../../sdkjs/common/libfont/manager.js", + "../../../../sdkjs/common/libfont/map.js", + "../../../../sdkjs/common/libfont/rasterheap.js", + "../../../../sdkjs/common/libfont/glyphstring.js", + "../../../../sdkjs/common/libfont/classification.js", + "../../../../sdkjs/common/libfont/character.js", "../../../../sdkjs/common/Drawings/Metafile.js", - "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js", + "../../../../sdkjs/common/libfont/textmeasurer.js", "../../../../sdkjs/common/Drawings/WorkEvents.js", "../../../../sdkjs/word/Editor/History.js", "../../../../sdkjs/common/Shapes/EditorSettings.js", diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 5cfe913f2..d17026643 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -25,16 +25,15 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/downloaderfiles.js", "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", - "../../../../sdkjs/common/FontsFreeType/font_engine.js", - "../../../../sdkjs/common/FontsFreeType/FontFile.js", - "../../../../sdkjs/common/FontsFreeType/font_map.js", - "../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js", - "../../../../sdkjs/common/FontsFreeType/GlyphString.js", - "../../../../sdkjs/common/FontsFreeType/FontManager.js", - "../../../../sdkjs/common/FontsFreeType/FontClassification.js", - "../../../../sdkjs/common/FontsFreeType/character.js", - "../../../../sdkjs/common/Drawings/Metafile.js", - "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js", + "../../../../sdkjs/common/libfont/loader.js", + "../../../../sdkjs/common/libfont/manager.js", + "../../../../sdkjs/common/libfont/map.js", + "../../../../sdkjs/common/libfont/rasterheap.js", + "../../../../sdkjs/common/libfont/glyphstring.js", + "../../../../sdkjs/common/libfont/classification.js", + "../../../../sdkjs/common/libfont/character.js", + "../../../../sdkjs/common/Drawings/Metafile.js", + "../../../../sdkjs/common/libfont/textmeasurer.js", "../../../../sdkjs/common/Drawings/WorkEvents.js", "../../../../sdkjs/cell/model/History.js", "../../../../sdkjs/common/Shapes/EditorSettings.js",