Fixed statistics page

piersdeseilligny · Nov 10, 2020 · 6e871c4 · 6e871c4
1 parent 6d31fde
commit 6e871c4
Show file tree

Hide file tree

Showing 74 changed files with 3 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/.vscodeignore b/.vscodeignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/FAQ.md b/FAQ.md
diff --git a/Fountainexport spec draft.md b/Fountainexport spec draft.md
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
diff --git a/assets/note_dark.svg b/assets/note_dark.svg
diff --git a/assets/note_dark_offset.svg b/assets/note_dark_offset.svg
diff --git a/assets/note_light.svg b/assets/note_light.svg
diff --git a/assets/note_light_offset.svg b/assets/note_light_offset.svg
diff --git a/assets/scene.svg b/assets/scene.svg
diff --git a/assets/section1.svg b/assets/section1.svg
diff --git a/assets/section2.svg b/assets/section2.svg
diff --git a/assets/section3.svg b/assets/section3.svg
diff --git a/assets/section4.svg b/assets/section4.svg
diff --git a/assets/section5.svg b/assets/section5.svg
diff --git a/assets/synopse.svg b/assets/synopse.svg
diff --git a/assets/synopse_offset.svg b/assets/synopse_offset.svg
diff --git a/assets/synopsis.svg b/assets/synopsis.svg
diff --git a/flaticon.svg b/flaticon.svg
diff --git a/icon.png b/icon.png
diff --git a/icon.svg b/icon.svg
diff --git a/icon_fullres.png b/icon_fullres.png
diff --git a/jest.config.js b/jest.config.js
diff --git a/language-configuration.json b/language-configuration.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/screenshots/Dark_plus.PNG b/screenshots/Dark_plus.PNG
diff --git a/screenshots/Github_dark.PNG b/screenshots/Github_dark.PNG
diff --git a/src/__mocks__/vscode.ts b/src/__mocks__/vscode.ts
diff --git a/src/afterwriting-parser.ts b/src/afterwriting-parser.ts
diff --git a/src/configloader.ts b/src/configloader.ts
diff --git a/src/courierprime/courier-prime-bold-italic.ttf b/src/courierprime/courier-prime-bold-italic.ttf
diff --git a/src/courierprime/courier-prime-bold.ttf b/src/courierprime/courier-prime-bold.ttf
diff --git a/src/courierprime/courier-prime-italic.ttf b/src/courierprime/courier-prime-italic.ttf
diff --git a/src/courierprime/courier-prime.ttf b/src/courierprime/courier-prime.ttf
diff --git a/src/extension.ts b/src/extension.ts
@@ -145,7 +145,7 @@ export async function exportPdf(showSaveDialog:boolean = true, openFileOnSave:bo
 
 	var parsed = await afterparser.parse(editor.document.getText(), config, false);
 
-	var exportconfig : ExportConfig = {highlighted_characters: []}
+	var exportconfig : ExportConfig = undefined
 	if ( highlightCharacters ) {
 		var highlighted_characters = await vscode.window.showQuickPick(Array.from(parsed.properties.characters.keys()) ,{canPickMany:true})
 		var exportconfig : ExportConfig = {highlighted_characters: highlighted_characters}

diff --git a/src/helpers.ts b/src/helpers.ts
diff --git a/src/noisetexture.png b/src/noisetexture.png
diff --git a/src/pdf/liner.ts b/src/pdf/liner.ts
diff --git a/src/pdf/pdf.ts b/src/pdf/pdf.ts
diff --git a/src/pdf/pdfmaker.ts b/src/pdf/pdfmaker.ts
@@ -490,11 +490,11 @@ import { openFile, revealFile, trimCharacterExtension, wordToColor } from "../ut
 
                 function get_text_properties(lline = line, expcfg = exportcfg, old_text_properties = general_text_properties) {
                     var  new_text_properties = Object.assign({},old_text_properties)
-                    if (lline.type === 'character') {
+                    if (!!expcfg && lline.type === 'character') {
                         var character = trimCharacterExtension(lline.text)
                         // refer to Liner in ./liner.ts
                         character = character.replace(/([0-9]* - )/, "");
-                        if (expcfg.highlighted_characters.includes(character)) {
+                        if (!!expcfg.highlighted_characters && expcfg.highlighted_characters.includes(character)) {
                             new_text_properties.highlight = true;
                             new_text_properties.highlightcolor = wordToColor(character);
                         };

diff --git a/src/pdf/print.ts b/src/pdf/print.ts
diff --git a/src/preview.html b/src/preview.html
diff --git a/src/providers/Completion.ts b/src/providers/Completion.ts
diff --git a/src/providers/Decorations.ts b/src/providers/Decorations.ts
diff --git a/src/providers/Folding.ts b/src/providers/Folding.ts
diff --git a/src/providers/Outline.ts b/src/providers/Outline.ts
diff --git a/src/providers/Preview.ts b/src/providers/Preview.ts
diff --git a/src/providers/Symbols.ts b/src/providers/Symbols.ts
diff --git a/src/script_to_time.txt b/src/script_to_time.txt
diff --git a/src/statistics.ts b/src/statistics.ts
diff --git a/src/telemetry.ts b/src/telemetry.ts
diff --git a/src/test/completion.test.ts b/src/test/completion.test.ts
diff --git a/src/test/diagnostics.test.ts b/src/test/diagnostics.test.ts
diff --git a/src/test/helper.ts b/src/test/helper.ts
diff --git a/src/test/index.ts b/src/test/index.ts
diff --git a/src/test/scripts/big_fish_crlf.fountain b/src/test/scripts/big_fish_crlf.fountain
diff --git a/src/test/scripts/big_fish_lf.fountain b/src/test/scripts/big_fish_lf.fountain
diff --git a/src/test/scripts/brick_and_steel_crlf.fountain b/src/test/scripts/brick_and_steel_crlf.fountain
diff --git a/src/test/scripts/brick_and_steel_lf.fountain b/src/test/scripts/brick_and_steel_lf.fountain
diff --git a/src/test/statistics.spec.ts b/src/test/statistics.spec.ts
diff --git a/src/token.ts b/src/token.ts
diff --git a/src/utils.ts b/src/utils.ts
diff --git a/src/utils/dispose.ts b/src/utils/dispose.ts
diff --git a/src/utils/topMostLineMonitor.ts b/src/utils/topMostLineMonitor.ts
diff --git a/syntaxes/fountain.tmlanguage b/syntaxes/fountain.tmlanguage
diff --git a/tsconfig.json b/tsconfig.json