From e2b62fc9f6d6f306ffdf991683783afe2bd12528 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 26 Apr 2021 18:22:16 +0200 Subject: [PATCH 01/17] Fix alternative save path in build, and also add in project wizard --- .gitignore | 1 + nw/tools/build.py | 4 ++-- nw/tools/projwizard.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9260acd3..7873a701 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ ToC.txt # Coverage /.coverage +/coverage.* diff --git a/nw/tools/build.py b/nw/tools/build.py index 58526af5..692498c8 100644 --- a/nw/tools/build.py +++ b/nw/tools/build.py @@ -853,10 +853,10 @@ class GuiBuildNovel(QDialog): cleanName = makeFileNameSafe(self.theProject.projName) fileName = "%s.%s" % (cleanName, fileExt) saveDir = self.mainConf.lastPath - savePath = os.path.join(saveDir, fileName) if not os.path.isdir(saveDir): - saveDir = self.mainConf.homePath + saveDir = os.path.expanduser("~") + savePath = os.path.join(saveDir, fileName) savePath, _ = QFileDialog.getSaveFileName( self, self.tr("Save Document As"), savePath ) diff --git a/nw/tools/projwizard.py b/nw/tools/projwizard.py index 81b885e8..a5bedcc6 100644 --- a/nw/tools/projwizard.py +++ b/nw/tools/projwizard.py @@ -210,7 +210,7 @@ class ProjWizardFolderPage(QWizardPage): """ lastPath = self.mainConf.lastPath if not os.path.isdir(lastPath): - lastPath = "" + lastPath = os.path.expanduser("~") projDir = QFileDialog.getExistingDirectory( self, self.tr("Select Project Folder"), lastPath, options=QFileDialog.ShowDirsOnly From 13cc2feb3fe5fcdd72d2217dcc8689eec4246479 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 26 Apr 2021 23:41:40 +0200 Subject: [PATCH 02/17] Improve build class test --- nw/tools/build.py | 37 ++- .../guiBuild_Tool_Step1G_Lorem_Ipsum.fodt | 141 ++++++++++++ .../guiBuild_Tool_Step2_Lorem_Ipsum.fodt | 210 ++++++++++++++++++ .../guiBuild_Tool_Step3_Lorem_Ipsum.fodt | 210 ++++++++++++++++++ tests/test_tools/test_tools_build.py | 54 ++++- 5 files changed, 625 insertions(+), 27 deletions(-) create mode 100644 tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt create mode 100644 tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt create mode 100644 tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt diff --git a/nw/tools/build.py b/nw/tools/build.py index 692498c8..2c01e4ef 100644 --- a/nw/tools/build.py +++ b/nw/tools/build.py @@ -848,26 +848,21 @@ class GuiBuildNovel(QDialog): # Generate File Name # ================== - if fileExt: + cleanName = makeFileNameSafe(self.theProject.projName) + fileName = "%s.%s" % (cleanName, fileExt) + saveDir = self.mainConf.lastPath + if not os.path.isdir(saveDir): + saveDir = os.path.expanduser("~") - cleanName = makeFileNameSafe(self.theProject.projName) - fileName = "%s.%s" % (cleanName, fileExt) - saveDir = self.mainConf.lastPath - if not os.path.isdir(saveDir): - saveDir = os.path.expanduser("~") - - savePath = os.path.join(saveDir, fileName) - savePath, _ = QFileDialog.getSaveFileName( - self, self.tr("Save Document As"), savePath - ) - if not savePath: - return False - - self.mainConf.setLastPath(savePath) - - else: + savePath = os.path.join(saveDir, fileName) + savePath, _ = QFileDialog.getSaveFileName( + self, self.tr("Save Document As"), savePath + ) + if not savePath: return False + self.mainConf.setLastPath(savePath) + # Build and Write # =============== @@ -995,9 +990,13 @@ class GuiBuildNovel(QDialog): errMsg - str(e) else: - errMsg = self.tr("Unknown format") + # If the if statements above and here match, it should not + # be possible to reach this else statement. + return False # pragma: no cover + + # Report to User + # ============== - # Report to user if wSuccess: self.theParent.makeAlert( "%s
%s" % ( diff --git a/tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt new file mode 100644 index 00000000..3495e89d --- /dev/null +++ b/tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt @@ -0,0 +1,141 @@ + + + + 2021-04-26T23:36:34.366445 + novelWriter/1.3rc1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem Ipsum / lipsum.com / 2 + + + + + + + + + Lorem Ipsum + + By lipsum.com + + “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…” + “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…” + Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32. + The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from “de Finibus Bonorum et Malorum” by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. + Prologue + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. + Act One + “Fusce maximus felis libero” + Chapter 1: Chapter One + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar. + * * * + Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada. + Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex. + Integer vel libero ipsum. Donec varius aliquam libero, sit amet commodo urna hendrerit non. Nullam quis erat mollis nunc viverra volutpat tincidunt in odio. Nam vitae quam sem. Aliquam suscipit nulla non lorem pharetra semper. Ut suscipit erat eu ligula accumsan ultrices. Phasellus nisl tellus, placerat sed laoreet id, consectetur nec dolor. Sed fringilla ipsum id dapibus posuere. Aenean finibus pharetra tincidunt. Ut molestie malesuada nulla, id posuere lorem tincidunt eu. Aliquam tempor eros a est vulputate, scelerisque pulvinar ipsum fermentum. In hac habitasse platea dictumst. + Curabitur congue, justo quis interdum fermentum, tellus nulla imperdiet sapien, eu interdum enim tellus condimentum metus. Vivamus nunc velit, dignissim ut ultrices sit amet, ultricies quis enim. Donec ut vestibulum neque. Vivamus semper neque id ex ullamcorper varius. Fusce mattis nibh viverra lorem sagittis, et tempor arcu congue. Suspendisse sit amet felis sed urna facilisis mattis eget vitae arcu. Proin eu magna hendrerit, tristique sem maximus, placerat diam. Nulla tristique sed velit sit amet varius. Etiam vel ornare magna, in vulputate arcu. Cras velit orci, tincidunt sed volutpat cursus, bibendum vel sem. Nunc vulputate pharetra tortor, ac consectetur neque tincidunt sit amet. Nulla ornare mi sed mi dignissim ultricies. Ut tincidunt bibendum mauris, sed elementum ex vulputate vel. Mauris fermentum, felis nec vehicula congue, felis lorem facilisis erat, a dictum dolor augue vitae quam. Maecenas rutrum tortor nec consequat eleifend. + * * * + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien. + Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis. + Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi. + Suspendisse potenti. Fusce tempus lorem nec laoreet suscipit. Fusce vulputate nisl ac diam tincidunt, nec malesuada quam pellentesque. Maecenas congue, tellus quis commodo rutrum, magna leo egestas arcu, quis suscipit ex risus id ligula. Suspendisse potenti. Morbi blandit lacus vitae laoreet vulputate. Donec vitae tellus eleifend, lobortis eros eu, tincidunt enim. Nullam et ullamcorper nisi. Vivamus tellus ex, lobortis quis rutrum ut, dapibus sit amet turpis. Phasellus pellentesque metus diam, commodo tristique ante commodo ac. Ut mollis ipsum nec diam blandit sollicitudin. Duis bibendum lacus nec commodo dapibus. Sed condimentum luctus ante, id ultricies urna varius nec. Nam convallis magna nec bibendum ultrices. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed auctor pharetra quam, vitae porta ex bibendum eu. + Vivamus ut venenatis lectus. Phasellus nec elit id sem dictum ornare. Quisque feugiat, diam eget sagittis ultricies, orci turpis efficitur nisi, et fringilla justo odio nec nibh. In hac habitasse platea dictumst. Sed tempus bibendum feugiat. Etiam luctus mauris arcu, non interdum ipsum ultrices id. Vivamus blandit urna sit amet scelerisque vulputate. Quisque in metus eget massa rutrum dictum sit amet sed nulla. Vivamus vel efficitur dolor. + Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et, vestibulum vitae augue. Praesent id ante sit amet odio venenatis placerat a at erat. Sed sed metus sed nisi dictum varius. Integer tincidunt fermentum purus ac porta. Fusce porttitor non risus eget tristique. Donec augue nunc, maximus at fermentum vel, varius et neque. Ut sed consectetur mauris. Quisque ipsum enim, porttitor vitae imperdiet sit amet, tempor et mauris. Aliquam malesuada tincidunt lectus quis blandit. Sed commodo orci felis, quis ultrices tellus facilisis sed. Nunc vel varius est. Duis ullamcorper eu metus in pulvinar. Morbi at sapien dictum, rutrum mauris eget, interdum tellus. + Chapter 2: Chapter Two + Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at. + * * * + Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis. + Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis. + Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus. + Aenean dapibus vulputate purus, sit amet tempor nunc suscipit consequat. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris auctor congue eros, non pellentesque neque dapibus ac. Vestibulum non leo nec urna lacinia eleifend quis et diam. Praesent eu nisi magna. Nulla at magna massa. Suspendisse porta varius scelerisque. Duis at auctor dolor, non dapibus urna. Nunc venenatis feugiat magna non molestie. Aliquam non ornare ex. Quisque eu ultrices velit, quis pellentesque eros. Phasellus eleifend, elit id imperdiet aliquam, nulla quam molestie turpis, at egestas odio ante et tortor. Suspendisse fringilla condimentum justo, at aliquet odio aliquam ac. + * * * + Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien. + Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum. + Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit. + Aenean vestibulum magna placerat fermentum tempus. Nam auctor condimentum nunc, in elementum quam ornare a. Etiam in ipsum elit. Proin pharetra, dolor sollicitudin pellentesque congue, lorem dolor ultricies magna, non iaculis risus nisl dictum diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Vivamus vel euismod nibh, et lobortis dolor. Maecenas dui odio, gravida nec molestie ut, feugiat ut arcu. Pellentesque risus sapien, gravida a convallis quis, ullamcorper porttitor sapien. + Donec ipsum eros, vestibulum sit amet cursus eget, iaculis quis dolor. Pellentesque magna augue, tristique dapibus mi vitae, molestie venenatis enim. Nam malesuada, turpis volutpat rhoncus ullamcorper, justo est eleifend orci, ut luctus risus ex rutrum arcu. Sed mi elit, feugiat rhoncus ornare sed, porta id leo. Pellentesque feugiat nulla tincidunt erat suscipit, eu congue lacus hendrerit. Morbi pulvinar enim sed consequat auctor. Ut eleifend enim sem, vitae euismod ex ultricies sit amet. Curabitur eu efficitur nisi, suscipit finibus sapien. In sodales blandit erat, vestibulum pulvinar ante volutpat nec. Vivamus dictum non libero at molestie. Donec sit amet neque in ante convallis pretium. Nunc vel iaculis dui. + Phasellus eu nunc ut nunc faucibus laoreet. Aliquam at magna risus. Praesent lobortis, risus finibus semper varius, magna purus vestibulum eros, at pulvinar sapien enim a ex. In scelerisque malesuada ex, sit amet egestas neque condimentum sed. Praesent vulputate efficitur massa. Cras at accumsan ligula. In elementum lectus eget blandit dictum. Nam vitae libero ut justo eleifend rutrum ac nec arcu. Aliquam sodales in quam congue vestibulum. Aliquam in accumsan sapien. Quisque lobortis nisl nisi, vitae bibendum turpis efficitur sed. Vestibulum tempor nulla eget nisi convallis, blandit sagittis ipsum convallis. Donec odio nibh, ultrices quis odio in, mollis euismod libero. + * * * + Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet. + In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere. + Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis. + Pellentesque rhoncus pharetra eros, non mollis nisi pretium non. Mauris accumsan quis odio quis euismod. Maecenas ultrices, augue et aliquam tincidunt, erat tellus ornare ligula, quis ultrices turpis nibh vel justo. Fusce gravida odio tellus. In a congue diam. Mauris consequat ex id leo lacinia dictum. Fusce id sem sodales, ultrices sapien ac, convallis orci. Donec gravida nunc sit amet nisi hendrerit, sed porta enim aliquam. In hac habitasse platea dictumst. Cras a orci felis. Curabitur non felis nec urna maximus auctor ut ut nisi. Curabitur at turpis eleifend, blandit eros at, molestie odio. Phasellus euismod neque augue. + Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo. + + + diff --git a/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt new file mode 100644 index 00000000..81bfa380 --- /dev/null +++ b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt @@ -0,0 +1,210 @@ + + + + 2021-04-26T23:35:34.393660 + novelWriter/1.3rc1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem Ipsum / lipsum.com / 2 + + + + + + + + + Lorem Ipsum + + By lipsum.com + + “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…” + “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…” + Comment: Exctracted from the lipsum.com website. + Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32. + The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from “de Finibus Bonorum et Malorum” by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. + Prologue + Synopsis: Explanation from the lipsum.com website. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. + Act One + “Fusce maximus felis libero” + Chapter One: Chapter One + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar. + Scene 1.1: Scene One + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. + Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada. + Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex. + 1.1.1: Scene One, Section Two + Integer vel libero ipsum. Donec varius aliquam libero, sit amet commodo urna hendrerit non. Nullam quis erat mollis nunc viverra volutpat tincidunt in odio. Nam vitae quam sem. Aliquam suscipit nulla non lorem pharetra semper. Ut suscipit erat eu ligula accumsan ultrices. Phasellus nisl tellus, placerat sed laoreet id, consectetur nec dolor. Sed fringilla ipsum id dapibus posuere. Aenean finibus pharetra tincidunt. Ut molestie malesuada nulla, id posuere lorem tincidunt eu. Aliquam tempor eros a est vulputate, scelerisque pulvinar ipsum fermentum. In hac habitasse platea dictumst. + Curabitur congue, justo quis interdum fermentum, tellus nulla imperdiet sapien, eu interdum enim tellus condimentum metus. Vivamus nunc velit, dignissim ut ultrices sit amet, ultricies quis enim. Donec ut vestibulum neque. Vivamus semper neque id ex ullamcorper varius. Fusce mattis nibh viverra lorem sagittis, et tempor arcu congue. Suspendisse sit amet felis sed urna facilisis mattis eget vitae arcu. Proin eu magna hendrerit, tristique sem maximus, placerat diam. Nulla tristique sed velit sit amet varius. Etiam vel ornare magna, in vulputate arcu. Cras velit orci, tincidunt sed volutpat cursus, bibendum vel sem. Nunc vulputate pharetra tortor, ac consectetur neque tincidunt sit amet. Nulla ornare mi sed mi dignissim ultricies. Ut tincidunt bibendum mauris, sed elementum ex vulputate vel. Mauris fermentum, felis nec vehicula congue, felis lorem facilisis erat, a dictum dolor augue vitae quam. Maecenas rutrum tortor nec consequat eleifend. + Scene 1.2: Scene Two + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien. + Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis. + Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi. + 1.2.1: Scene Two, Section Two + Suspendisse potenti. Fusce tempus lorem nec laoreet suscipit. Fusce vulputate nisl ac diam tincidunt, nec malesuada quam pellentesque. Maecenas congue, tellus quis commodo rutrum, magna leo egestas arcu, quis suscipit ex risus id ligula. Suspendisse potenti. Morbi blandit lacus vitae laoreet vulputate. Donec vitae tellus eleifend, lobortis eros eu, tincidunt enim. Nullam et ullamcorper nisi. Vivamus tellus ex, lobortis quis rutrum ut, dapibus sit amet turpis. Phasellus pellentesque metus diam, commodo tristique ante commodo ac. Ut mollis ipsum nec diam blandit sollicitudin. Duis bibendum lacus nec commodo dapibus. Sed condimentum luctus ante, id ultricies urna varius nec. Nam convallis magna nec bibendum ultrices. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed auctor pharetra quam, vitae porta ex bibendum eu. + Vivamus ut venenatis lectus. Phasellus nec elit id sem dictum ornare. Quisque feugiat, diam eget sagittis ultricies, orci turpis efficitur nisi, et fringilla justo odio nec nibh. In hac habitasse platea dictumst. Sed tempus bibendum feugiat. Etiam luctus mauris arcu, non interdum ipsum ultrices id. Vivamus blandit urna sit amet scelerisque vulputate. Quisque in metus eget massa rutrum dictum sit amet sed nulla. Vivamus vel efficitur dolor. + Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et, vestibulum vitae augue. Praesent id ante sit amet odio venenatis placerat a at erat. Sed sed metus sed nisi dictum varius. Integer tincidunt fermentum purus ac porta. Fusce porttitor non risus eget tristique. Donec augue nunc, maximus at fermentum vel, varius et neque. Ut sed consectetur mauris. Quisque ipsum enim, porttitor vitae imperdiet sit amet, tempor et mauris. Aliquam malesuada tincidunt lectus quis blandit. Sed commodo orci felis, quis ultrices tellus facilisis sed. Nunc vel varius est. Duis ullamcorper eu metus in pulvinar. Morbi at sapien dictum, rutrum mauris eget, interdum tellus. + Chapter Two: Why do we use it? + Comment: Exctracted from the lipsum.com website. + It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. + The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. + Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). + Chapter Three: Chapter Two + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. + Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at. + Scene 3.1: Scene Three + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis. + Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis. + Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus. + Aenean dapibus vulputate purus, sit amet tempor nunc suscipit consequat. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris auctor congue eros, non pellentesque neque dapibus ac. Vestibulum non leo nec urna lacinia eleifend quis et diam. Praesent eu nisi magna. Nulla at magna massa. Suspendisse porta varius scelerisque. Duis at auctor dolor, non dapibus urna. Nunc venenatis feugiat magna non molestie. Aliquam non ornare ex. Quisque eu ultrices velit, quis pellentesque eros. Phasellus eleifend, elit id imperdiet aliquam, nulla quam molestie turpis, at egestas odio ante et tortor. Suspendisse fringilla condimentum justo, at aliquet odio aliquam ac. + Scene 3.2: Scene Four + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. + Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien. + Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum. + Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit. + Aenean vestibulum magna placerat fermentum tempus. Nam auctor condimentum nunc, in elementum quam ornare a. Etiam in ipsum elit. Proin pharetra, dolor sollicitudin pellentesque congue, lorem dolor ultricies magna, non iaculis risus nisl dictum diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Vivamus vel euismod nibh, et lobortis dolor. Maecenas dui odio, gravida nec molestie ut, feugiat ut arcu. Pellentesque risus sapien, gravida a convallis quis, ullamcorper porttitor sapien. + Donec ipsum eros, vestibulum sit amet cursus eget, iaculis quis dolor. Pellentesque magna augue, tristique dapibus mi vitae, molestie venenatis enim. Nam malesuada, turpis volutpat rhoncus ullamcorper, justo est eleifend orci, ut luctus risus ex rutrum arcu. Sed mi elit, feugiat rhoncus ornare sed, porta id leo. Pellentesque feugiat nulla tincidunt erat suscipit, eu congue lacus hendrerit. Morbi pulvinar enim sed consequat auctor. Ut eleifend enim sem, vitae euismod ex ultricies sit amet. Curabitur eu efficitur nisi, suscipit finibus sapien. In sodales blandit erat, vestibulum pulvinar ante volutpat nec. Vivamus dictum non libero at molestie. Donec sit amet neque in ante convallis pretium. Nunc vel iaculis dui. + Phasellus eu nunc ut nunc faucibus laoreet. Aliquam at magna risus. Praesent lobortis, risus finibus semper varius, magna purus vestibulum eros, at pulvinar sapien enim a ex. In scelerisque malesuada ex, sit amet egestas neque condimentum sed. Praesent vulputate efficitur massa. Cras at accumsan ligula. In elementum lectus eget blandit dictum. Nam vitae libero ut justo eleifend rutrum ac nec arcu. Aliquam sodales in quam congue vestibulum. Aliquam in accumsan sapien. Quisque lobortis nisl nisi, vitae bibendum turpis efficitur sed. Vestibulum tempor nulla eget nisi convallis, blandit sagittis ipsum convallis. Donec odio nibh, ultrices quis odio in, mollis euismod libero. + Scene 3.3: Scene Five + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. + Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet. + In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere. + Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis. + Pellentesque rhoncus pharetra eros, non mollis nisi pretium non. Mauris accumsan quis odio quis euismod. Maecenas ultrices, augue et aliquam tincidunt, erat tellus ornare ligula, quis ultrices turpis nibh vel justo. Fusce gravida odio tellus. In a congue diam. Mauris consequat ex id leo lacinia dictum. Fusce id sem sodales, ultrices sapien ac, convallis orci. Donec gravida nunc sit amet nisi hendrerit, sed porta enim aliquam. In hac habitasse platea dictumst. Cras a orci felis. Curabitur non felis nec urna maximus auctor ut ut nisi. Curabitur at turpis eleifend, blandit eros at, molestie odio. Phasellus euismod neque augue. + Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo. + Notes: Characters + Nobody Owens + Tag: Bod + Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus. + Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat. + Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque. + Notes: Plot + Main Plot + Tag: Main + Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet. + Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur. + Notes: World + Ancient Europe + Tag: Europe + Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula. + Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque. + Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim. + + + diff --git a/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt new file mode 100644 index 00000000..2e026419 --- /dev/null +++ b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt @@ -0,0 +1,210 @@ + + + + 2021-04-26T23:38:33.054190 + novelWriter/1.3rc1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem Ipsum / lipsum.com / 2 + + + + + + + + + Lorem Ipsum + + By lipsum.com + + “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…” + “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…” + Comment: Exctracted from the lipsum.com website. + Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32. + The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from “de Finibus Bonorum et Malorum” by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. + Prologue + Synopsis: Explanation from the lipsum.com website. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. + Act One + “Fusce maximus felis libero” + Chapter One: Chapter One + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar. + Scene 1.1: Scene One + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. + Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada. + Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex. + 1.1.1: Scene One, Section Two + Integer vel libero ipsum. Donec varius aliquam libero, sit amet commodo urna hendrerit non. Nullam quis erat mollis nunc viverra volutpat tincidunt in odio. Nam vitae quam sem. Aliquam suscipit nulla non lorem pharetra semper. Ut suscipit erat eu ligula accumsan ultrices. Phasellus nisl tellus, placerat sed laoreet id, consectetur nec dolor. Sed fringilla ipsum id dapibus posuere. Aenean finibus pharetra tincidunt. Ut molestie malesuada nulla, id posuere lorem tincidunt eu. Aliquam tempor eros a est vulputate, scelerisque pulvinar ipsum fermentum. In hac habitasse platea dictumst. + Curabitur congue, justo quis interdum fermentum, tellus nulla imperdiet sapien, eu interdum enim tellus condimentum metus. Vivamus nunc velit, dignissim ut ultrices sit amet, ultricies quis enim. Donec ut vestibulum neque. Vivamus semper neque id ex ullamcorper varius. Fusce mattis nibh viverra lorem sagittis, et tempor arcu congue. Suspendisse sit amet felis sed urna facilisis mattis eget vitae arcu. Proin eu magna hendrerit, tristique sem maximus, placerat diam. Nulla tristique sed velit sit amet varius. Etiam vel ornare magna, in vulputate arcu. Cras velit orci, tincidunt sed volutpat cursus, bibendum vel sem. Nunc vulputate pharetra tortor, ac consectetur neque tincidunt sit amet. Nulla ornare mi sed mi dignissim ultricies. Ut tincidunt bibendum mauris, sed elementum ex vulputate vel. Mauris fermentum, felis nec vehicula congue, felis lorem facilisis erat, a dictum dolor augue vitae quam. Maecenas rutrum tortor nec consequat eleifend. + Scene 1.2: Scene Two + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien. + Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis. + Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi. + 1.2.1: Scene Two, Section Two + Suspendisse potenti. Fusce tempus lorem nec laoreet suscipit. Fusce vulputate nisl ac diam tincidunt, nec malesuada quam pellentesque. Maecenas congue, tellus quis commodo rutrum, magna leo egestas arcu, quis suscipit ex risus id ligula. Suspendisse potenti. Morbi blandit lacus vitae laoreet vulputate. Donec vitae tellus eleifend, lobortis eros eu, tincidunt enim. Nullam et ullamcorper nisi. Vivamus tellus ex, lobortis quis rutrum ut, dapibus sit amet turpis. Phasellus pellentesque metus diam, commodo tristique ante commodo ac. Ut mollis ipsum nec diam blandit sollicitudin. Duis bibendum lacus nec commodo dapibus. Sed condimentum luctus ante, id ultricies urna varius nec. Nam convallis magna nec bibendum ultrices. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed auctor pharetra quam, vitae porta ex bibendum eu. + Vivamus ut venenatis lectus. Phasellus nec elit id sem dictum ornare. Quisque feugiat, diam eget sagittis ultricies, orci turpis efficitur nisi, et fringilla justo odio nec nibh. In hac habitasse platea dictumst. Sed tempus bibendum feugiat. Etiam luctus mauris arcu, non interdum ipsum ultrices id. Vivamus blandit urna sit amet scelerisque vulputate. Quisque in metus eget massa rutrum dictum sit amet sed nulla. Vivamus vel efficitur dolor. + Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et, vestibulum vitae augue. Praesent id ante sit amet odio venenatis placerat a at erat. Sed sed metus sed nisi dictum varius. Integer tincidunt fermentum purus ac porta. Fusce porttitor non risus eget tristique. Donec augue nunc, maximus at fermentum vel, varius et neque. Ut sed consectetur mauris. Quisque ipsum enim, porttitor vitae imperdiet sit amet, tempor et mauris. Aliquam malesuada tincidunt lectus quis blandit. Sed commodo orci felis, quis ultrices tellus facilisis sed. Nunc vel varius est. Duis ullamcorper eu metus in pulvinar. Morbi at sapien dictum, rutrum mauris eget, interdum tellus. + Chapter Two: Why do we use it? + Comment: Exctracted from the lipsum.com website. + It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. + The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. + Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). + Chapter Three: Chapter Two + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. + Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at. + Scene 3.1: Scene Three + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis. + Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis. + Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus. + Aenean dapibus vulputate purus, sit amet tempor nunc suscipit consequat. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris auctor congue eros, non pellentesque neque dapibus ac. Vestibulum non leo nec urna lacinia eleifend quis et diam. Praesent eu nisi magna. Nulla at magna massa. Suspendisse porta varius scelerisque. Duis at auctor dolor, non dapibus urna. Nunc venenatis feugiat magna non molestie. Aliquam non ornare ex. Quisque eu ultrices velit, quis pellentesque eros. Phasellus eleifend, elit id imperdiet aliquam, nulla quam molestie turpis, at egestas odio ante et tortor. Suspendisse fringilla condimentum justo, at aliquet odio aliquam ac. + Scene 3.2: Scene Four + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. + Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien. + Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum. + Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit. + Aenean vestibulum magna placerat fermentum tempus. Nam auctor condimentum nunc, in elementum quam ornare a. Etiam in ipsum elit. Proin pharetra, dolor sollicitudin pellentesque congue, lorem dolor ultricies magna, non iaculis risus nisl dictum diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Vivamus vel euismod nibh, et lobortis dolor. Maecenas dui odio, gravida nec molestie ut, feugiat ut arcu. Pellentesque risus sapien, gravida a convallis quis, ullamcorper porttitor sapien. + Donec ipsum eros, vestibulum sit amet cursus eget, iaculis quis dolor. Pellentesque magna augue, tristique dapibus mi vitae, molestie venenatis enim. Nam malesuada, turpis volutpat rhoncus ullamcorper, justo est eleifend orci, ut luctus risus ex rutrum arcu. Sed mi elit, feugiat rhoncus ornare sed, porta id leo. Pellentesque feugiat nulla tincidunt erat suscipit, eu congue lacus hendrerit. Morbi pulvinar enim sed consequat auctor. Ut eleifend enim sem, vitae euismod ex ultricies sit amet. Curabitur eu efficitur nisi, suscipit finibus sapien. In sodales blandit erat, vestibulum pulvinar ante volutpat nec. Vivamus dictum non libero at molestie. Donec sit amet neque in ante convallis pretium. Nunc vel iaculis dui. + Phasellus eu nunc ut nunc faucibus laoreet. Aliquam at magna risus. Praesent lobortis, risus finibus semper varius, magna purus vestibulum eros, at pulvinar sapien enim a ex. In scelerisque malesuada ex, sit amet egestas neque condimentum sed. Praesent vulputate efficitur massa. Cras at accumsan ligula. In elementum lectus eget blandit dictum. Nam vitae libero ut justo eleifend rutrum ac nec arcu. Aliquam sodales in quam congue vestibulum. Aliquam in accumsan sapien. Quisque lobortis nisl nisi, vitae bibendum turpis efficitur sed. Vestibulum tempor nulla eget nisi convallis, blandit sagittis ipsum convallis. Donec odio nibh, ultrices quis odio in, mollis euismod libero. + Scene 3.3: Scene Five + Point of View: Bod + Plot: Main + Locations: Europe + Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. + Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet. + In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere. + Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis. + Pellentesque rhoncus pharetra eros, non mollis nisi pretium non. Mauris accumsan quis odio quis euismod. Maecenas ultrices, augue et aliquam tincidunt, erat tellus ornare ligula, quis ultrices turpis nibh vel justo. Fusce gravida odio tellus. In a congue diam. Mauris consequat ex id leo lacinia dictum. Fusce id sem sodales, ultrices sapien ac, convallis orci. Donec gravida nunc sit amet nisi hendrerit, sed porta enim aliquam. In hac habitasse platea dictumst. Cras a orci felis. Curabitur non felis nec urna maximus auctor ut ut nisi. Curabitur at turpis eleifend, blandit eros at, molestie odio. Phasellus euismod neque augue. + Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo. + Notes: Characters + Nobody Owens + Tag: Bod + Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus. + Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat. + Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque. + Notes: Plot + Main Plot + Tag: Main + Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet. + Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur. + Notes: World + Ancient Europe + Tag: Europe + Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula. + Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque. + Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim. + + + diff --git a/tests/test_tools/test_tools_build.py b/tests/test_tools/test_tools_build.py index 5cf6a8ef..02e0fcbd 100644 --- a/tests/test_tools/test_tools_build.py +++ b/tests/test_tools/test_tools_build.py @@ -50,7 +50,6 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): # Open a project assert nwGUI.openProject(nwLipsum) - nwGUI.mainConf.lastPath = nwLipsum # Open the tool nwGUI.mainMenu.aBuildProject.activate(QAction.Trigger) @@ -62,18 +61,37 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): nwBuild.textFont.setText("DejaVu Sans") nwBuild.textSize.setValue(11) + # Test Save + # ========= + + # Invalid file format + assert not nwBuild._saveDocument(-1) + + # Non-existent path + with monkeypatch.context() as mp: + mp.setattr("os.path.expanduser", lambda *args, **kwargs: nwLipsum) + assert nwGUI.mainConf.lastPath != nwLipsum + nwGUI.mainConf.lastPath = "no_such_path" + assert nwBuild._saveDocument(nwBuild.FMT_NWD) + assert nwGUI.mainConf.lastPath == nwLipsum + + # No path selected + with monkeypatch.context() as mp: + mp.setattr(QFileDialog, "getSaveFileName", lambda *args, **kwargs: ("", "")) + assert not nwBuild._saveDocument(nwBuild.FMT_NWD) + # Default Settings + nwGUI.mainConf.lastPath = nwLipsum qtbot.mouseClick(nwBuild.buildNovel, Qt.LeftButton) assert nwBuild._saveDocument(nwBuild.FMT_NWD) - assert nwBuild._saveDocument(nwBuild.FMT_HTM) - projFile = os.path.join(nwLipsum, "Lorem Ipsum.nwd") testFile = os.path.join(outDir, "guiBuild_Tool_Step1_Lorem_Ipsum.nwd") compFile = os.path.join(refDir, "guiBuild_Tool_Step1_Lorem_Ipsum.nwd") copyfile(projFile, testFile) assert cmpFiles(testFile, compFile) + assert nwBuild._saveDocument(nwBuild.FMT_HTM) projFile = os.path.join(nwLipsum, "Lorem Ipsum.htm") testFile = os.path.join(outDir, "guiBuild_Tool_Step1_Lorem_Ipsum.htm") compFile = os.path.join(refDir, "guiBuild_Tool_Step1_Lorem_Ipsum.htm") @@ -94,6 +112,13 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): copyfile(projFile, testFile) assert cmpFiles(testFile, compFile) + assert nwBuild._saveDocument(nwBuild.FMT_FODT) + projFile = os.path.join(nwLipsum, "Lorem Ipsum.fodt") + testFile = os.path.join(outDir, "guiBuild_Tool_Step1G_Lorem_Ipsum.fodt") + compFile = os.path.join(refDir, "guiBuild_Tool_Step1G_Lorem_Ipsum.fodt") + copyfile(projFile, testFile) + assert cmpFiles(testFile, compFile, [4]) + # Change Title Formats and Flip Switches nwBuild.fmtChapter.setText(r"Chapter %chw%: %title%") qtbot.wait(stepDelay) @@ -121,14 +146,13 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): qtbot.mouseClick(nwBuild.buildNovel, Qt.LeftButton) assert nwBuild._saveDocument(nwBuild.FMT_NWD) - assert nwBuild._saveDocument(nwBuild.FMT_HTM) - projFile = os.path.join(nwLipsum, "Lorem Ipsum.nwd") testFile = os.path.join(outDir, "guiBuild_Tool_Step2_Lorem_Ipsum.nwd") compFile = os.path.join(refDir, "guiBuild_Tool_Step2_Lorem_Ipsum.nwd") copyfile(projFile, testFile) assert cmpFiles(testFile, compFile) + assert nwBuild._saveDocument(nwBuild.FMT_HTM) projFile = os.path.join(nwLipsum, "Lorem Ipsum.htm") testFile = os.path.join(outDir, "guiBuild_Tool_Step2_Lorem_Ipsum.htm") compFile = os.path.join(refDir, "guiBuild_Tool_Step2_Lorem_Ipsum.htm") @@ -142,6 +166,13 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): copyfile(projFile, testFile) assert cmpFiles(testFile, compFile) + assert nwBuild._saveDocument(nwBuild.FMT_FODT) + projFile = os.path.join(nwLipsum, "Lorem Ipsum.fodt") + testFile = os.path.join(outDir, "guiBuild_Tool_Step2_Lorem_Ipsum.fodt") + compFile = os.path.join(refDir, "guiBuild_Tool_Step2_Lorem_Ipsum.fodt") + copyfile(projFile, testFile) + assert cmpFiles(testFile, compFile, [4]) + # Replace Tabs with Spaces qtbot.mouseClick(nwBuild.replaceTabs, Qt.LeftButton) qtbot.wait(stepDelay) @@ -170,6 +201,13 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): copyfile(projFile, testFile) assert cmpFiles(testFile, compFile) + assert nwBuild._saveDocument(nwBuild.FMT_FODT) + projFile = os.path.join(nwLipsum, "Lorem Ipsum.fodt") + testFile = os.path.join(outDir, "guiBuild_Tool_Step3_Lorem_Ipsum.fodt") + compFile = os.path.join(refDir, "guiBuild_Tool_Step3_Lorem_Ipsum.fodt") + copyfile(projFile, testFile) + assert cmpFiles(testFile, compFile, [4]) + # Putline Mode nwBuild.fmtChapter.setText(r"Chapter %chw%: %title%") qtbot.wait(stepDelay) @@ -219,12 +257,12 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): copyfile(projFile, testFile) assert cmpFiles(testFile, compFile, [8]) - # Save other file types handled by Qt - # We assume the export itself by the Qt library works, so we just - # check that novelWriter successfully writes the files. + # Since odt and fodt is built by the same code, we don't check the + # output. but just that the different format can be written as well assert nwBuild._saveDocument(nwBuild.FMT_ODT) assert os.path.isfile(os.path.join(nwLipsum, "Lorem Ipsum.odt")) + # Print to PDF if not nwGUI.mainConf.osDarwin: assert nwBuild._saveDocument(nwBuild.FMT_PDF) assert os.path.isfile(os.path.join(nwLipsum, "Lorem Ipsum.pdf")) From 2fc36f83557e4e3a68a311e969270240d0315fbf Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 26 Apr 2021 23:47:47 +0200 Subject: [PATCH 03/17] Fix timestamp format in odt generator --- nw/core/toodt.py | 2 +- ..._Lorem_Ipsum.fodt => guiBuild_Tool_Step1_Lorem_Ipsum.fodt} | 2 +- tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt | 2 +- tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt | 2 +- tests/test_tools/test_tools_build.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename tests/reference/{guiBuild_Tool_Step1G_Lorem_Ipsum.fodt => guiBuild_Tool_Step1_Lorem_Ipsum.fodt} (99%) diff --git a/nw/core/toodt.py b/nw/core/toodt.py index 89b74148..98c26feb 100644 --- a/nw/core/toodt.py +++ b/nw/core/toodt.py @@ -298,7 +298,7 @@ class ToOdt(Tokenizer): # Meta Data xMeta = etree.SubElement(self._xMeta, _mkTag("meta", "creation-date")) - xMeta.text = datetime.now().isoformat() + xMeta.text = datetime.now().strftime("%Y-%m-%dT%H:%M:%S") xMeta = etree.SubElement(self._xMeta, _mkTag("meta", "generator")) xMeta.text = f"novelWriter/{nw.__version__}" diff --git a/tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt similarity index 99% rename from tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt rename to tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt index 3495e89d..0a86798c 100644 --- a/tests/reference/guiBuild_Tool_Step1G_Lorem_Ipsum.fodt +++ b/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt @@ -1,7 +1,7 @@ - 2021-04-26T23:36:34.366445 + 2021-04-26T23:36:34 novelWriter/1.3rc1 diff --git a/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt index 81bfa380..5dbff219 100644 --- a/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt +++ b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt @@ -1,7 +1,7 @@ - 2021-04-26T23:35:34.393660 + 2021-04-26T23:35:34 novelWriter/1.3rc1 diff --git a/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt index 2e026419..3411a1e1 100644 --- a/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt +++ b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt @@ -1,7 +1,7 @@ - 2021-04-26T23:38:33.054190 + 2021-04-26T23:38:33 novelWriter/1.3rc1 diff --git a/tests/test_tools/test_tools_build.py b/tests/test_tools/test_tools_build.py index 02e0fcbd..cb16a557 100644 --- a/tests/test_tools/test_tools_build.py +++ b/tests/test_tools/test_tools_build.py @@ -114,8 +114,8 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): assert nwBuild._saveDocument(nwBuild.FMT_FODT) projFile = os.path.join(nwLipsum, "Lorem Ipsum.fodt") - testFile = os.path.join(outDir, "guiBuild_Tool_Step1G_Lorem_Ipsum.fodt") - compFile = os.path.join(refDir, "guiBuild_Tool_Step1G_Lorem_Ipsum.fodt") + testFile = os.path.join(outDir, "guiBuild_Tool_Step1_Lorem_Ipsum.fodt") + compFile = os.path.join(refDir, "guiBuild_Tool_Step1_Lorem_Ipsum.fodt") copyfile(projFile, testFile) assert cmpFiles(testFile, compFile, [4]) From 551fd0aaf9ada84a81f1ae30f215993720457934 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 26 Apr 2021 23:54:32 +0200 Subject: [PATCH 04/17] This line should not have been changed --- nw/tools/projwizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nw/tools/projwizard.py b/nw/tools/projwizard.py index a5bedcc6..81b885e8 100644 --- a/nw/tools/projwizard.py +++ b/nw/tools/projwizard.py @@ -210,7 +210,7 @@ class ProjWizardFolderPage(QWizardPage): """ lastPath = self.mainConf.lastPath if not os.path.isdir(lastPath): - lastPath = os.path.expanduser("~") + lastPath = "" projDir = QFileDialog.getExistingDirectory( self, self.tr("Select Project Folder"), lastPath, options=QFileDialog.ShowDirsOnly From 3e77e24b1f7cfd220498f44f6b261a673003f46f Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 1 May 2021 17:12:59 +0200 Subject: [PATCH 05/17] The i18n files are no read from assets, while the ts files remain in the root folder --- .gitignore | 4 +++ {i18n => nw/assets/i18n}/project_de.json | 0 {i18n => nw/assets/i18n}/project_en.json | 0 {i18n => nw/assets/i18n}/project_fr.json | 0 {i18n => nw/assets/i18n}/project_nb_NO.json | 0 {i18n => nw/assets/i18n}/project_nn_NO.json | 0 {i18n => nw/assets/i18n}/project_pt.json | 0 nw/config.py | 2 +- setup.py | 33 +++++++++++++++++++++ 9 files changed, 38 insertions(+), 1 deletion(-) rename {i18n => nw/assets/i18n}/project_de.json (100%) rename {i18n => nw/assets/i18n}/project_en.json (100%) rename {i18n => nw/assets/i18n}/project_fr.json (100%) rename {i18n => nw/assets/i18n}/project_nb_NO.json (100%) rename {i18n => nw/assets/i18n}/project_nn_NO.json (100%) rename {i18n => nw/assets/i18n}/project_pt.json (100%) diff --git a/.gitignore b/.gitignore index 7873a701..f07eb4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ setup.iss novelwriter.desktop novelWriter.pyw + +# Translations +/nw/assets/i18n/*.qm +.qmake.stash i18n/*.qm i18n/*.qph diff --git a/i18n/project_de.json b/nw/assets/i18n/project_de.json similarity index 100% rename from i18n/project_de.json rename to nw/assets/i18n/project_de.json diff --git a/i18n/project_en.json b/nw/assets/i18n/project_en.json similarity index 100% rename from i18n/project_en.json rename to nw/assets/i18n/project_en.json diff --git a/i18n/project_fr.json b/nw/assets/i18n/project_fr.json similarity index 100% rename from i18n/project_fr.json rename to nw/assets/i18n/project_fr.json diff --git a/i18n/project_nb_NO.json b/nw/assets/i18n/project_nb_NO.json similarity index 100% rename from i18n/project_nb_NO.json rename to nw/assets/i18n/project_nb_NO.json diff --git a/i18n/project_nn_NO.json b/nw/assets/i18n/project_nn_NO.json similarity index 100% rename from i18n/project_nn_NO.json rename to nw/assets/i18n/project_nn_NO.json diff --git a/i18n/project_pt.json b/nw/assets/i18n/project_pt.json similarity index 100% rename from i18n/project_pt.json rename to nw/assets/i18n/project_pt.json diff --git a/nw/config.py b/nw/config.py index bea508bc..b2703d77 100644 --- a/nw/config.py +++ b/nw/config.py @@ -307,7 +307,7 @@ class Config: self.appIcon = os.path.join(self.iconPath, "novelwriter.svg") # Internationalisation - self.nwLangPath = os.path.join(self.appRoot, "i18n") + self.nwLangPath = os.path.join(self.assetPath, "i18n") logger.verbose("App path: %s" % self.appPath) logger.verbose("Last path: %s" % self.lastPath) diff --git a/setup.py b/setup.py index 25703109..4075bd55 100755 --- a/setup.py +++ b/setup.py @@ -217,12 +217,36 @@ def buildQtDocs(): def buildQtI18n(): """Build the lang.qm files for Qt Linguist. """ + print("") + print("Building Qt Localisation Files") + print("==============================") + print("") + try: subprocess.call(["lrelease", "-verbose", "novelWriter.pro"]) except Exception as e: print("QtI18n Release Error:") print(str(e)) + print("") + print("Copying Files to nw/assets") + print("") + + langDir = os.path.join("nw", "assets", "i18n") + for langFile in os.listdir("i18n"): + langPath = os.path.join("i18n", langFile) + if not os.path.isfile(langPath): + continue + + if langFile.endswith(".qm"): + destPath = os.path.join(langDir, langFile) + os.rename(langPath, destPath) + print("Moved: %s -> %s" % (langPath, destPath)) + + print("") + + return + ## # Qt Linguist TS Builder (qtlupdate) ## @@ -230,12 +254,21 @@ def buildQtI18n(): def buildQtI18nTS(): """Build the lang.ts files for Qt Linguist. """ + print("") + print("Building Qt Translation Files") + print("=============================") + print("") + try: subprocess.call(["pylupdate5", "-verbose", "-noobsolete", "novelWriter.pro"]) except Exception as e: print("QtI18n Release Error:") print(str(e)) + print("") + + return + ## # Sample Project ZIP File Builder (sample) ## From 03e9fb93c7ce76f589a258e8807144e227eaef13 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 1 May 2021 17:14:04 +0200 Subject: [PATCH 06/17] Update readmes --- README.md | 4 +++ i18n/README.md | 66 ++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 5f4e7ff3..29434c87 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,10 @@ Contributions to this project are welcome. However, please read the [Contributing Guide](https://github.com/vkbo/novelWriter/blob/main/CONTRIBUTING.md) before submitting larger additions or changes. +If you want to help translating novelWriter into another language, please see the +[README](https://github.com/vkbo/novelWriter/blob/main/i18n/README.md) in the `nw/assets/i18n` +folder. + ## Key Features Some key features of novelWriter are listed below. Consult the diff --git a/i18n/README.md b/i18n/README.md index 400cd8b8..0b053248 100644 --- a/i18n/README.md +++ b/i18n/README.md @@ -1,58 +1,56 @@ # novelWriter Internationalisation -The `i18n` folder contains the internationalisation files for novelWriter. -There are two types of files. The `nw_XX.ts` / `nw_XX.qm` files are for -localisation of the main GUI, and the `project_XX.json` files are JSON files -with translation maps for the novelWriter projects, used by the Build Novel -Project tool. +The `i18n` folder contains the translation files for the Qt5 GUI. There are two types of files +involved: the `nw_XX.ts` and the `nw_XX.qm` files. The `nw_XX.ts` files are located in the `i18n` +folder at the root of the repository, and the `nw_XX.qm` together with the `project_XX.json` files +are located in `nw/assets/i18n`. The latter are JSON files translation maps for the novelWriter +projects, used by the Build Novel Project tool. -## GUI Localisation +## Qt GUI Localisation -The `.qm` files are the actual files used by the application to translate the -GUI into another language other than the default British English. The files are -not generated by default. They can be built with: +The `.qm` files are the actual files used by the application to translate the GUI into another +language other than the default British English. The files are not generated by default. They can +be built with: ```bash python3 setup.py qtlrelease ``` -To add a new translation file, first add a new entry in the `novelWriter.pro` -file under the `TRANSLATIONS` variable. Please use the underscore syntax for -file names as the importer expects this format. +To add a new translation file, first add a new entry in the `novelWriter.pro` file under the +`TRANSLATIONS` variable. Please use the underscore syntax for file names as the importer expects +this format. After adding the entry in the `.pro` file, run: ```bash python3 setup.py qtlupdate ``` -This will build a new `nw_XX.ts` file for the language you just added. The file -can then be edited with the Qt 5 Linguist application provided by Qt. This is -by far easier than manually editing the `.ts` file. Please select "English" and -"United Kingdom" as the source langauge when prompted by Qt 5 Linguist. +This will build a new `i18n/nw_XX.ts` file for the language you just added. The file can then be +edited with the Qt 5 Linguist application provided by Qt. This is by far easier than manually +editing the `.ts` file. Please select "English" and "United Kingdom" as the source langauge when +prompted by Qt 5 Linguist. -When you're done editing, you can build the `nw_XX.qm` file and test it in -novelWriter. The Preferences dialog should list the newly added language, and -you can select it and test it. +When you're done editing, you can build the `nw/assets/i18n/nw_XX.qm` file and test it in +novelWriter. The Preferences dialog should list the newly added language, and you can select it and +test it. -Please do not submit the `.qm` files to the repository. Only the `.ts` files +Please do not submit the `.qm` files to the repository. Only the `.ts` files in the `i18n` folder are needed. -**Note:** This requires that you have the tools Qt 5 Linguist and `pylupdate5` +**Note:** This requires that you have the tools Qt 5 Linguist and the PyQt5 tool `pylupdate5` installed on your system. ## Project Localisation -Projects can have a different language setting than the GUI itself. The files -with format `project_XX.json` are simple translation maps for text that goes -into the exported documents generated by the Build Novel Project tool. +Projects can have a different language setting than the GUI itself. The files with format +`project_XX.json` in `nw/assets/i18n` are simple translation maps for text that goes into the +exported documents generated by the Build Novel Project tool. -The files are loaded based on the language setting on the build tool. At the -present time, no other parts of the application use these files. Since these -are used as replacement lookups, they are maintained as plain JSON files. The -main usage is to generate chapter headers as number words. +The files are loaded based on the language setting in the build tool. At the present time, no other +parts of the application use these files. Since these are used as replacement lookups, they are +maintained as plain JSON files. The main usage is to generate chapter headers as number words. -There is no trick to using these files. Just copy the `project_en.json` file, -rename it to the appropriate language coded filename, and edit it. Please use -the underscore as separator if a language needs to be localised to a specific -country under a language. The importer will for instance look for `en_US` -first, then use `en` if it is not found. If there are no matching files, the -project falls back to using English. +Adding new translations for these files is easy. Just copy the `project_en.json` file, rename it to +the appropriate language coded filename, and edit it. Please use the underscore as separator if a +language needs to be localised to a specific country under a language. The importer will for +instance look for `en_US` first, then use `en` if it is not found. If there are no matching files, +the project falls back to using English. From fb5e4a5f17438964db294b4a239eda6e5b73a57c Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 1 May 2021 17:14:13 +0200 Subject: [PATCH 07/17] Update translations --- i18n/nw_en_US.ts | 17 ++++++----------- i18n/nw_fr.ts | 17 ++++++----------- i18n/nw_nb_NO.ts | 17 ++++++----------- i18n/nw_pt.ts | 17 ++++++----------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/i18n/nw_en_US.ts b/i18n/nw_en_US.ts index 404338ef..31f2e286 100644 --- a/i18n/nw_en_US.ts +++ b/i18n/nw_en_US.ts @@ -757,22 +757,17 @@ - + Save Document As - - Unknown format - - - - + {0} file successfully written to: - + Failed to write {0} file. {1} @@ -780,17 +775,17 @@ GuiBuildNovelDocView - + This area will show the content of the document to be exported or printed. Press the "Build Preview" button to generate content. - + Unknown - + <b>Build Time:</b> {0} diff --git a/i18n/nw_fr.ts b/i18n/nw_fr.ts index 8761c05d..9bad5160 100644 --- a/i18n/nw_fr.ts +++ b/i18n/nw_fr.ts @@ -757,22 +757,17 @@ PDF - + Save Document As Enregistrer le document sous - - Unknown format - Format inconnu - - - + {0} file successfully written to: Fichier {0} écrit dans : - + Failed to write {0} file. {1} Erreur lors de l'écriture du fichier {0}. {1} @@ -780,17 +775,17 @@ GuiBuildNovelDocView - + This area will show the content of the document to be exported or printed. Press the "Build Preview" button to generate content. Dans cette zone s'affichera le contenu du document à exporter ou à imprimer. Utilisez le bouton "Construire l'aperçu" pour générer le contenu. - + Unknown Inconnu - + <b>Build Time:</b> {0} <b>Durée de construction :</b> {0} diff --git a/i18n/nw_nb_NO.ts b/i18n/nw_nb_NO.ts index d27e4cfa..b3467bdf 100644 --- a/i18n/nw_nb_NO.ts +++ b/i18n/nw_nb_NO.ts @@ -742,22 +742,17 @@ - + Save Document As Lagre dokumentet som - - Unknown format - Ukjent format - - - + {0} file successfully written to: Lagring av {0} var vellykket, og filen ble skrevet til: - + Failed to write {0} file. {1} Misslykkes i å skrive {0} til. {1} @@ -780,17 +775,17 @@ GuiBuildNovelDocView - + This area will show the content of the document to be exported or printed. Press the "Build Preview" button to generate content. Dette området vil vise innholdet av dokumentet som skal eksporteres. Trykk på knappen merket med "Lag forhåndsvisning" for å oppdatere innholdet. - + Unknown Ukjent - + <b>Build Time:</b> {0} <b>Generert den:</b> {0} diff --git a/i18n/nw_pt.ts b/i18n/nw_pt.ts index ec69bf37..6a370a45 100644 --- a/i18n/nw_pt.ts +++ b/i18n/nw_pt.ts @@ -451,11 +451,6 @@ Plain HTML HTML Simples - - - Unknown format - Formato desconhecido - novelWriter HTML (.htm) @@ -592,17 +587,17 @@ Fechar - + Save Document As Salvar Documento Como - + {0} file successfully written to: Arquivo {0} escrito com sucesso para: - + Failed to write {0} file. {1} Falhou para escrever o arquivo {0}. {1} @@ -780,17 +775,17 @@ GuiBuildNovelDocView - + Unknown Desconhecido - + This area will show the content of the document to be exported or printed. Press the "Build Preview" button to generate content. Esta área vai mostrar o conteúdo do documento a ser exportado ou impresso. Clique no botão "Construir Prévia" para gerar o conteúdo. - + <b>Build Time:</b> {0} <b>Tempo de Construção:</b> {0} From 754863e42cb210f7febac6997766e3ac7d794f20 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 1 May 2021 17:18:15 +0200 Subject: [PATCH 08/17] Fix setup message --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4075bd55..83644bb6 100755 --- a/setup.py +++ b/setup.py @@ -229,7 +229,7 @@ def buildQtI18n(): print(str(e)) print("") - print("Copying Files to nw/assets") + print("Moving QM Files to Assets") print("") langDir = os.path.join("nw", "assets", "i18n") From 94f070f096df1f02cc7933489e0868bc107f3cfa Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:20:32 +0200 Subject: [PATCH 09/17] Fix setup entries for i18n files for minimal packages --- i18n/{dummy_qtbase.py => qtbase.py} | 4 ++-- novelWriter.pro | 2 +- setup.py | 11 +---------- 3 files changed, 4 insertions(+), 13 deletions(-) rename i18n/{dummy_qtbase.py => qtbase.py} (97%) diff --git a/i18n/dummy_qtbase.py b/i18n/qtbase.py similarity index 97% rename from i18n/dummy_qtbase.py rename to i18n/qtbase.py index 1c5c7122..5b466fc8 100644 --- a/i18n/dummy_qtbase.py +++ b/i18n/qtbase.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -Dummy Qt Translation File -========================= +Qt Base Translation File +======================== This file causes Qt Linguist to generate translation entries for the Qt elements that need translation in novelWriter for those languages who do diff --git a/novelWriter.pro b/novelWriter.pro index de214cd1..859473bd 100644 --- a/novelWriter.pro +++ b/novelWriter.pro @@ -1,5 +1,5 @@ SOURCES += \ - i18n/dummy_qtbase.py \ + i18n/qtbase.py \ nw/core/document.py \ nw/core/project.py \ nw/core/tokenizer.py \ diff --git a/setup.py b/setup.py index 83644bb6..1ac6eb06 100755 --- a/setup.py +++ b/setup.py @@ -371,6 +371,7 @@ def makeMinimalPackage(targetOS): with ZipFile(outFile, "w", compression=ZIP_DEFLATED, compresslevel=9) as zipObj: if targetOS != OS_WIN: + # Not needed for Windows as the icons are in nw/assets/icons for nRoot, _, nFiles in os.walk("setup"): print("Adding Folder: %s [%d files]" % (nRoot, len(nFiles))) for aFile in nFiles: @@ -388,15 +389,6 @@ def makeMinimalPackage(targetOS): continue zipObj.write(os.path.join(nRoot, aFile)) - for aFile in os.listdir("i18n"): - i18File = os.path.join("i18n", aFile) - if not os.path.isfile(i18File): - continue - - if i18File.endswith((".json", ".qm")): - zipObj.write(i18File) - print("Adding File: %s" % i18File) - if targetOS == OS_WIN: zipObj.write("novelWriter.py", "novelWriter.pyw") print("Adding File: novelWriter.pyw") @@ -409,7 +401,6 @@ def makeMinimalPackage(targetOS): print("Adding File: novelWriter.py") for aFile in rootFiles: - assert os.path.isfile(aFile) print("Adding File: %s" % aFile) zipObj.write(aFile) From 14e266b93864cb545aceb92767f1c9d4b593440f Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:28:38 +0200 Subject: [PATCH 10/17] Update i18n README --- i18n/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/i18n/README.md b/i18n/README.md index 0b053248..82c9ccfa 100644 --- a/i18n/README.md +++ b/i18n/README.md @@ -39,6 +39,22 @@ are needed. **Note:** This requires that you have the tools Qt 5 Linguist and the PyQt5 tool `pylupdate5` installed on your system. +### Missing QtBase Translations + +The default Qt dialogs also have translations, for instance for standard buttons for "Yes", "No", +"Ok", "Cancel", etc. Generally, these translations files are installed with the Qt libraries on +your system, and novelWriter will collect those translations from there. However, these +translations are missing for many languages. + +As a starting point, there is no need to translate any entries in the `.ts` files that are under +elements starting with the letter "Q", like "QPlatformTheme", "QWizard", etc. If these turn up in +English in novelWriter after activating a translation, it means they are probably missing in the Qt +library, and you may also need to translate these. + +These additional translation entries are generated from a file named `i18n/qtbase.py`, which is not +a file that novelWriter uses. It is there only to generate these additional entries for the `.ts` +files. + ## Project Localisation Projects can have a different language setting than the GUI itself. The files with format From b8be2277c44383f166002c7eaf6631b128f3c79e Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:34:09 +0200 Subject: [PATCH 11/17] Merge linux workflows --- .../{test_linux_3.6.yml => test_linux.yml} | 9 +++-- .github/workflows/test_linux_3.7.yml | 37 ------------------- .github/workflows/test_linux_3.8.yml | 37 ------------------- .github/workflows/test_linux_3.9.yml | 37 ------------------- .github/workflows/test_mac.yml | 4 +- .github/workflows/test_win.yml | 4 +- 6 files changed, 10 insertions(+), 118 deletions(-) rename .github/workflows/{test_linux_3.6.yml => test_linux.yml} (85%) delete mode 100644 .github/workflows/test_linux_3.7.yml delete mode 100644 .github/workflows/test_linux_3.8.yml delete mode 100644 .github/workflows/test_linux_3.9.yml diff --git a/.github/workflows/test_linux_3.6.yml b/.github/workflows/test_linux.yml similarity index 85% rename from .github/workflows/test_linux_3.6.yml rename to .github/workflows/test_linux.yml index a13d7c11..81584457 100644 --- a/.github/workflows/test_linux_3.6.yml +++ b/.github/workflows/test_linux.yml @@ -1,4 +1,4 @@ -name: Linux (3.6) +name: Linux on: push: @@ -7,13 +7,16 @@ on: branches: [ main, testing, dev ] jobs: - testLinux36: + testLinux: + strategy: + matrix: + python-version: [3.6, 3.7, 3.8, 3.9] runs-on: ubuntu-latest steps: - name: Python Setup uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: ${{ matrix.python-version }} architecture: x64 - name: Install Packages run: | diff --git a/.github/workflows/test_linux_3.7.yml b/.github/workflows/test_linux_3.7.yml deleted file mode 100644 index 1b323b9c..00000000 --- a/.github/workflows/test_linux_3.7.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Linux (3.7) - -on: - push: - branches: [ main, testing, dev ] - pull_request: - branches: [ main, testing, dev ] - -jobs: - testLinux37: - runs-on: ubuntu-latest - steps: - - name: Python Setup - uses: actions/setup-python@v2 - with: - python-version: 3.7 - architecture: x64 - - name: Install Packages - run: | - sudo apt update - sudo apt install libenchant-dev qt5-default - - name: Checkout Source - uses: actions/checkout@v2 - - name: Install Dependencies - run: | - pip install --upgrade pip - pip install -r requirements.txt - pip install pytest-timeout - pip install pytest-cov - pip install pytest-qt - pip install codecov - - name: Run Tests - run: | - export QT_QPA_PLATFORM=offscreen - pytest -v --cov=nw --timeout=60 - - name: Upload to Codecov - uses: codecov/codecov-action@v1 diff --git a/.github/workflows/test_linux_3.8.yml b/.github/workflows/test_linux_3.8.yml deleted file mode 100644 index cb1bc8c4..00000000 --- a/.github/workflows/test_linux_3.8.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Linux (3.8) - -on: - push: - branches: [ main, testing, dev ] - pull_request: - branches: [ main, testing, dev ] - -jobs: - testLinux38: - runs-on: ubuntu-latest - steps: - - name: Python Setup - uses: actions/setup-python@v2 - with: - python-version: 3.8 - architecture: x64 - - name: Install Packages - run: | - sudo apt update - sudo apt install libenchant-dev qt5-default - - name: Checkout Source - uses: actions/checkout@v2 - - name: Install Dependencies - run: | - pip install --upgrade pip - pip install -r requirements.txt - pip install pytest-timeout - pip install pytest-cov - pip install pytest-qt - pip install codecov - - name: Run Tests - run: | - export QT_QPA_PLATFORM=offscreen - pytest -v --cov=nw --timeout=60 - - name: Upload to Codecov - uses: codecov/codecov-action@v1 diff --git a/.github/workflows/test_linux_3.9.yml b/.github/workflows/test_linux_3.9.yml deleted file mode 100644 index 433596db..00000000 --- a/.github/workflows/test_linux_3.9.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Linux (3.9) - -on: - push: - branches: [ main, testing, dev ] - pull_request: - branches: [ main, testing, dev ] - -jobs: - testLinux39: - runs-on: ubuntu-latest - steps: - - name: Python Setup - uses: actions/setup-python@v2 - with: - python-version: 3.9 - architecture: x64 - - name: Install Packages - run: | - sudo apt update - sudo apt install libenchant-dev qt5-default - - name: Checkout Source - uses: actions/checkout@v2 - - name: Install Dependencies - run: | - pip install --upgrade pip - pip install -r requirements.txt - pip install pytest-timeout - pip install pytest-cov - pip install pytest-qt - pip install codecov - - name: Run Tests - run: | - export QT_QPA_PLATFORM=offscreen - pytest -v --cov=nw --timeout=60 - - name: Upload to Codecov - uses: codecov/codecov-action@v1 diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 54811cc6..1855e4cd 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -1,4 +1,4 @@ -name: macOS (3.9) +name: macOS on: push: @@ -7,7 +7,7 @@ on: branches: [ main, testing, dev ] jobs: - testMac39: + testMac: runs-on: macos-latest steps: - name: Python Setup diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 496485c6..2c016d4d 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -1,4 +1,4 @@ -name: Windows (3.9) +name: Windows on: push: @@ -7,7 +7,7 @@ on: branches: [ main, testing, dev ] jobs: - testWin39: + testWin: runs-on: windows-latest steps: - name: Python Setup From 851f67d86f27b23f1b614adae8a069f6e9645da7 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:39:34 +0200 Subject: [PATCH 12/17] Update badges --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 29434c87..a721ae54 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,8 @@ # novelWriter -[![Linux (3.6)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.6)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![Linux (3.7)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.7)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![Linux (3.8)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![Linux (3.9)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![Windows (3.9)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![macOS (3.9)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) +[![Linux](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml) +[![Windows](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml) +[![macOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml) [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) From 009160b6bfd500c249688a72d8bcc815ab76d51c Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:40:45 +0200 Subject: [PATCH 13/17] Add a paragraph break --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a721ae54..c5d87907 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) + [![release](https://img.shields.io/github/v/release/vkbo/novelwriter)](https://github.com/vkbo/novelWriter/releases) [![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter) [![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter) From cccdab45dc14d8cb2f508f255caffd7b8796dc26 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 15:50:26 +0200 Subject: [PATCH 14/17] Add novelwriter banner png --- setup/novelwriter.png | Bin 0 -> 17670 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 setup/novelwriter.png diff --git a/setup/novelwriter.png b/setup/novelwriter.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f169cdd19761c77eb22915121baa963c308e64 GIT binary patch literal 17670 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 Date: Sun, 2 May 2021 15:57:38 +0200 Subject: [PATCH 15/17] Add a custom long description for PyPi --- README.md | 3 +-- setup.cfg | 2 +- setup/long_description.md | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 setup/long_description.md diff --git a/README.md b/README.md index c5d87907..af613ee4 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,7 @@ [![macOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml) [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) -[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) - +[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![release](https://img.shields.io/github/v/release/vkbo/novelwriter)](https://github.com/vkbo/novelWriter/releases) [![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter) [![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter) diff --git a/setup.cfg b/setup.cfg index 01f6989b..0ef845b5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ author = Veronica Berglyd Olsen author_email = code@vkbo.net description = A markdown-like document editor for writing novels url = https://novelwriter.io -long_description = file: README.md +long_description = file: setup/long_description.md long_description_content_type = text/markdown license_file = LICENSE.md license = GNU General Public License v3 diff --git a/setup/long_description.md b/setup/long_description.md new file mode 100644 index 00000000..ff60a17e --- /dev/null +++ b/setup/long_description.md @@ -0,0 +1,21 @@ + + +novelWriter is a plain text editor designed for writing novels assembled from many smaller text +documents. It uses a minimal formatting syntax inspired by Markdown, and adds a meta data syntax +for comments, synopsis, and cross-referencing. It's designed to be a simple text editor that allows +for easy organisation of text and notes, using human readable text files as storage for robustness. + +The project storage is suitable for version control software, and also well suited for file +synchronisation tools. All text is saved as plain text files with a meta data header, the core +project structure is stored in a single project XML file, and other meta data is primarily saved as +JSON files. + +The application is written in Python 3 (3.6+) using Qt5 and PyQt5 (5.3+). It is developed on Linux, +but should in principle work fine on other operating systems as well as long as dependencies are +met. It is regularly tested on Debian and Ubuntu Linux, Windows, and macOS. + +novelWriter is developed and maintained by [Veronica Berglyd Olsen](https://github.com/vkbo). + +**Website:** https://novelwriter.io +**Documentation:** https://novelwriter.readthedocs.io +**Source Code:** https://github.com/vkbo/novelWriter From 9c0f596c0d98846c7fa971053d36ddff05dae28f Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 16:49:08 +0200 Subject: [PATCH 16/17] Release 1.3 --- CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++ docs/source/conf.py | 2 +- nw/__init__.py | 6 ++-- nw/assets/text/release_notes.htm | 28 ++++++++++++----- sample/nwProject.nwx | 6 ++-- 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91878a70..60bc72e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,59 @@ # novelWriter Changelog +## Version 1.3 [2021-05-02] + +### Release Notes + +The main feature of the 1.3 release is internationalisation. The release introduces support for +Portuguese, French, and Norwegian for the main GUI, in addition to the default English. The +settings for choosing the GUI language can be found in the main Preferences. + +The implementation is such that the projects themselves can use a different language than the one +selected for the GUI. To allow for better support for multiple language projects, the Build Novel +Project tool has the added option to select the language of the injected text into exported +documents. In particularly for the number words that can be added for chapter headers. Available +languages here are the same as mentioned above for the main GUI, plus German. + +Settings have also been added in Preferences to allow for automatic injection of spaces or non- +breaking spaces in front of, or behind, certain characters. These are features generally available +in text editors for French, but the implementation in novelWriter simply makes them a free text box +where you can list all characters or symbols where you want a space added automatically. + +The translation files for this release have been provided by Bruno Meneguello for the Portuguese +translation, by Jan Lüdke (jyhelle) for the French translation, by Veronica Berglyd Olsen for the +Norwegian translation as well as the minor modifications for US English, and Marian Lückhof +provided the translation file for chapter numbers in German. + +The work to rewrite novelWriter to allow for internationalisation was done by Bruno Meneguello and +Veronica Berglyd Olsen. + +_These Release Notes also include the changes from 1.3 Beta 1 and RC 1._ + +### Detailed Changelog + +**Bugfixes** + +* Fixed an issue when saving a document from the Build Novel Project tool when the previous path + used for a file dialog no longer existed. The dialog defaults to show the same folder as last + time it was opened, but should default to the user's home folder if that path no longer exists. + There was a bug in this default behaviour that resulted in a critical error. Issue #761. PR #762. +* Remove a duplicate error message triggered by a broken cached index file. The two error messages + reported on the same error. The first of them was also not included in the translation framework. + PR #759. + +**Installation** + +* The setup script, and file locations for the translation files, have been updated such that the + translation files are available in both the PyPi package and in the Minimal Install packages. + PRs #753, #764 and #765. + +**Code Maintenance** + +* The source code files for dialogs and tools have been moved out of the main `gui` source folder. + The `gui` folder now only contains sub-elements of the main GUI class. PR #754. + +---- + ## Version 1.3 RC 1 [2021-04-18] ### Release Notes diff --git a/docs/source/conf.py b/docs/source/conf.py index af2ae7ad..73308b04 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -27,7 +27,7 @@ author = "Veronica Berglyd Olsen" # The short X.Y version version = "1.3" # The full version, including alpha/beta/rc tags -release = "1.3-rc1" +release = "1.3" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index e07ba2fa..9cd28627 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -62,9 +62,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "1.3rc1" -__hexversion__ = "0x010300c1" -__date__ = "2021-04-18" +__version__ = "1.3" +__hexversion__ = "0x010300f0" +__date__ = "2021-05-02" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index b8c5f4e6..ba7ecefd 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,13 +2,27 @@ -

Release Notes for 1.3 RC 1

-

Released on 18 April 2021

-

This is a release candidate of 1.3. The primary feature of release 1.3 is the addition of -internationalisation (i18n) of novelWriter. The release introduces support for Portuguese, French, -and Norwegian in addition to the default English.

-

There have been no major changes since the release of 1.3 Beta 1, but the bugfixes and -improvements from version 1.2.3 have been included.

+

Release Notes for 1.3

+

Released on 2 May 2021

+

The main feature of the 1.3 release is internationalisation. The release introduces support for +Portuguese, French, and Norwegian for the main GUI, in addition to the default English. The +settings for choosing the GUI language can be found in the main Preferences.

+

The implementation is such that the projects themselves can use a different language than the +one selected for the GUI. To allow for better support for multiple language projects, the Build +Novel Project tool has the added option to select the language of the injected text into exported +documents. In particularly for the number words that can be added for chapter headers. Available +languages here are the same as mentioned above for the main GUI, plus German.

+

Settings have also been added in Preferences to allow for automatic injection of spaces or +non-breaking spaces in front of, or behind, certain characters. These are features generally +available in text editors for French, but the implementation in novelWriter simply makes them a +free text box where you can list all characters or symbols where you want a space added +automatically.

+

The translation files for this release have been provided by Bruno Meneguello for the Portuguese +translation, by Jan Lüdke (jyhelle) for the French translation, by Veronica Berglyd Olsen for the +Norwegian translation as well as the minor modifications for US English, and Marian Lückhof +provided the translation file for chapter numbers in German.

+

The work to rewrite novelWriter to allow for internationalisation was done by Bruno Meneguello +and Veronica Berglyd Olsen.

See also the Releases page.

diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index a6eea4bc..a61941a2 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 1059 + 1060 166 - 49528 + 49679 False From 9980d225f5ddde23a062214ef228253c5e980bf6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 May 2021 16:54:25 +0200 Subject: [PATCH 17/17] Fix test that failed due to change in version number --- tests/test_tools/test_tools_build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_tools/test_tools_build.py b/tests/test_tools/test_tools_build.py index cb16a557..46865368 100644 --- a/tests/test_tools/test_tools_build.py +++ b/tests/test_tools/test_tools_build.py @@ -117,7 +117,7 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): testFile = os.path.join(outDir, "guiBuild_Tool_Step1_Lorem_Ipsum.fodt") compFile = os.path.join(refDir, "guiBuild_Tool_Step1_Lorem_Ipsum.fodt") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile, [4]) + assert cmpFiles(testFile, compFile, [4, 5]) # Change Title Formats and Flip Switches nwBuild.fmtChapter.setText(r"Chapter %chw%: %title%") @@ -171,7 +171,7 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): testFile = os.path.join(outDir, "guiBuild_Tool_Step2_Lorem_Ipsum.fodt") compFile = os.path.join(refDir, "guiBuild_Tool_Step2_Lorem_Ipsum.fodt") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile, [4]) + assert cmpFiles(testFile, compFile, [4, 5]) # Replace Tabs with Spaces qtbot.mouseClick(nwBuild.replaceTabs, Qt.LeftButton) @@ -206,7 +206,7 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir): testFile = os.path.join(outDir, "guiBuild_Tool_Step3_Lorem_Ipsum.fodt") compFile = os.path.join(refDir, "guiBuild_Tool_Step3_Lorem_Ipsum.fodt") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile, [4]) + assert cmpFiles(testFile, compFile, [4, 5]) # Putline Mode nwBuild.fmtChapter.setText(r"Chapter %chw%: %title%")