View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0017351 | Scribus | - | public | 2024-12-26 19:49 | 2024-12-26 19:49 |
Reporter | luzpaz | Assigned To | |||
Priority | normal | Severity | minor | Reproducibility | N/A |
Status | new | Resolution | open | ||
Product Version | 1.7.0.svn | ||||
Summary | 0017351: [Patch] FIx various typos | ||||
Description | This patch fixes source comment typos, some doxygen related typos, there is also a possible bug fixed through a source typo fix. Please feel free to cherrypick whatever isn't relevant. | ||||
Tags | No tags attached. | ||||
Patch | Yes | ||||
|
typos-dec-2024.patch (67,963 bytes)
From 49f8adfae6dd3c30a2d5e29c5f3cd4288942dabd Mon Sep 17 00:00:00 2001 From: luzpaz <luzpaz@spam.org> Date: Thu, 26 Dec 2024 14:03:48 -0500 Subject: [PATCH] Fix various typos Found via `codespell -q 3 -S "*.dic,*.sla,*.ts,./ChangeLog,./scribus/third_party,./doc/cs,./doc/pl,./doc/de,./doc/fr,./doc/ru,./doc/it,./codegen/cheetah,./resources/manpages/scribus.1.de,./resources/templates/template.??.xml,./resources/unicodemap/unicodenameslist.txt,./resources/loremipsum,./resources/dicts/README_*" -L addres,afile,aktion,childs,colorin,currenty,dashs,datas,dokument,dum,endcodes,ende,fo,fram,indexin,indx,inh,ist,linheight,localy,nam,nd,parm,parms,pinter,prfile,ressize,secondy,serie,siz,stil,strin,symbole,symboles,te,tekst,tryes,unter,vor,wHeight` --- AppImage-package/bundle.sh | 2 +- OSX-package/Makefile | 2 +- doc/en/color7c.html | 2 +- doc/en/faq1.html | 4 +-- doc/en/fileproblems.html | 2 +- doc/en/readme-macosx.html | 2 +- doc/en/readme.html | 4 +-- doc/en/scripterapi-ImageExport.html | 2 +- doc/en/scripterapi-PDFfile.html | 2 +- doc/en/scripterapi-dialogs.html | 2 +- doc/en/scripterapi-getobjprop.html | 2 +- doc/en/scripterapi-lines.html | 2 +- doc/en/settings1.html | 2 +- doc/en/toolbox2.html | 4 +-- doc/en/toolbox20.html | 2 +- doc/en/toolbox3.html | 2 +- doc/en/topten.html | 2 +- scribus/actionmanager.cpp | 2 +- scribus/canvasgesture_linemove.h | 2 +- scribus/colorblind.h | 4 +-- scribus/commonstrings.h | 2 +- scribus/desaxe/simple_actions.h | 2 +- scribus/exif.cpp | 6 ++-- scribus/fileloader.cpp | 2 +- scribus/fonts/scface.h | 2 +- scribus/fonts/scfontmetrics.cpp | 2 +- scribus/loadsaveplugin.h | 2 +- scribus/manager/dock_manager.h | 2 +- scribus/pdflib_core.cpp | 2 +- scribus/plugins/fontpreview/fontpreview.h | 2 +- .../import/idml_old/importidmlimpl.cpp | 4 +-- scribus/plugins/scripter/python/mikro.py | 32 +++++++++---------- .../plugins/scriptplugin/cmdgetsetprop.cpp | 4 +-- scribus/plugins/scriptplugin/objimageexport.h | 2 +- scribus/plugins/scriptplugin/objpdffile.cpp | 2 +- scribus/plugins/scriptplugin/objprinter.cpp | 2 +- scribus/plugins/scriptplugin/pconsole.h | 2 +- .../scripter2/scripter2_qttype_qstring.cpp | 2 +- scribus/plugins/scriptplugin/scriptpaths.cpp | 2 +- .../scriptplugin/scripts/CalendarWizard.py | 2 +- .../scriptplugin/scripts/FrenchAutotypo.py | 20 ++++++------ .../scriptplugin/scripts/Ligatursatz.py | 4 +-- scribus/prefsstructs.h | 2 +- scribus/sccolor.h | 2 +- scribus/scpageoutput.cpp | 2 +- scribus/scplugin.h | 2 +- scribus/storyloader.cpp | 2 +- scribus/styles/paragraphstyle.h | 2 +- scribus/text/design.txt | 4 +-- scribus/text/scrptrun.cc | 2 +- scribus/text/scrptrun.cpp | 2 +- scribus/ui/actionsearchdialog.cpp | 2 +- scribus/ui/helpbrowser.h | 2 +- scribus/ui/hruler.cpp | 4 +-- scribus/ui/inspage.cpp | 2 +- scribus/ui/linemarkerselector.cpp | 2 +- scribus/ui/multiprogressdialog.h | 2 +- scribus/ui/pagepropertiesdialog.cpp | 2 +- scribus/ui/prefs_indexes.cpp | 2 +- scribus/ui/shortcutwidget.cpp | 2 +- scribus/ui/stylemanager.cpp | 4 +-- scribus/undomanager.h | 2 +- scribus/util_math.h | 2 +- scribus/vgradient.h | 2 +- 64 files changed, 100 insertions(+), 100 deletions(-) diff --git a/AppImage-package/bundle.sh b/AppImage-package/bundle.sh index b37899e50..eff0eaf31 100644 --- a/AppImage-package/bundle.sh +++ b/AppImage-package/bundle.sh @@ -36,7 +36,7 @@ cp ./appdir/usr/share/icons/hicolor/256x256/apps/scribus.png ./appdir/ sed -i -e 's|^Icon=.*|Icon=scribus|g' ./appdir/usr/share/applications/scribus.desktop ######################################################################## -# Bundle everyhting +# Bundle everything # to allow the AppImage to run on older systems as well ######################################################################## diff --git a/OSX-package/Makefile b/OSX-package/Makefile index f04d60e06..cda3a0b37 100644 --- a/OSX-package/Makefile +++ b/OSX-package/Makefile @@ -1,6 +1,6 @@ # currently a handpicked list of libraries Scribus depends on DEPLIBRARIES=zlib.pkg jpeg.pkg tiff.pkg lcms.pkg freetype.pkg cairo.pkg -# these wil be optional packages later +# these will be optional packages later ADDITIONAL=ghostscript.mpkg antiword.pkg aspell.pkg # this MUST be the installed path of the Scribus.app bundle SCRIBUSAPP=/usr/local/Applications/Scribus135.app diff --git a/doc/en/color7c.html b/doc/en/color7c.html index 878c06ce7..7bce51f9f 100644 --- a/doc/en/color7c.html +++ b/doc/en/color7c.html @@ -24,7 +24,7 @@ <td><img src="images/GG_CE_ex3.png" align="center"/></td> </tr> <tr> - <td><p>Tint variantion</p></td> + <td><p>Tint variation</p></td> <td><p>Two-color opposites</p></td> <td><p>Two-color complement</p></td> </tr> diff --git a/doc/en/faq1.html b/doc/en/faq1.html index 91cf873ad..c7605582c 100644 --- a/doc/en/faq1.html +++ b/doc/en/faq1.html @@ -145,10 +145,10 @@ <p>There are several reasons why there are no import filters for commercial DTP applications.</p> <ol> <li>DTP file formats are very complex internally – they are probably the most complex file formats. Creating import/export filters is a task far more difficult than importing a spreadsheet or simpler word processing document. An engineer familiar with the internal file format of PageMaker compared it to a 2m x 3 m flow chart diagram in 6 point type. It was not until the arrival of InDesign 2.0 that reliable PageMaker file import was possible in another DTP application, even though Adobe had the file format specs.</li> - <li>The file formats are not documented publically.</li> + <li>The file formats are not documented publicly.</li> <li>So, is it unethical/illegal to apply hexedit to an InDesign or XPress file to reverse engineer the file format with hexedit or others for the purpose of creating the export/import plugins for Scribus?<br/>Probably not, but given their closed nature, we cannot rule out the possibility of legal bullying by a commercial vendor, as we did from Quark when there was a Quark importer in testing. We do not have the legal resources to challenge large proprietary software companies. A German vendor of DTP software successfully reverse-engineered Quark’s file format and created an import filter. It took a long legal battle for them to succeed.</li> <li>Developer constraints. It is the considered judgement of the development team that efforts to improve Scribus is a more valuable use of time.</li> - <li>As an exception to the rule, we are open to implement publically available format specifications. For example, the XML version of InDesign's file format (IDML) is very well documented, and the spec is freely (i.e. without any legal restrictions that prevent the implementation of an import filter) available. Thus, a team member took the time and wrote an import filter, which is currently being tested. The same goes for formatted text snippets from QuarkXPress, called XPress Tags.</li> + <li>As an exception to the rule, we are open to implement publicly available format specifications. For example, the XML version of InDesign's file format (IDML) is very well documented, and the spec is freely (i.e. without any legal restrictions that prevent the implementation of an import filter) available. Thus, a team member took the time and wrote an import filter, which is currently being tested. The same goes for formatted text snippets from QuarkXPress, called XPress Tags.</li> </ol> <a href="#top">Back to top</a><hr/> </li> diff --git a/doc/en/fileproblems.html b/doc/en/fileproblems.html index e7d94bbd9..257c6fed7 100644 --- a/doc/en/fileproblems.html +++ b/doc/en/fileproblems.html @@ -27,7 +27,7 @@ <h4>Files Created with an Earlier Version of Scribus</h4> <p>When you open a file created with an earlier version of Scribus, you will see a warning that you may or may not want to ignore. You can ignore it if you are sure that the file won’t have to be opened in an earlier version again, e.g. if you created the file yourself and simply upgraded to a newer Scribus version. If you’re working in a team, you should <b>always</b> make sure that all team members use the same version of Scribus.</p> -<table width="100%"><tr><td align="center"><img src="images/file-error2.png" title="Warning about file format backward incompatibilty" alt="Warning about file format backward incompatibilty"/></td></tr></table> +<table width="100%"><tr><td align="center"><img src="images/file-error2.png" title="Warning about file format backward incompatibility" alt="Warning about file format backward incompatibility"/></td></tr></table> <p>But what if you ignored the warning or saved the file inadvertently, knowing that your partner has to or wants to use an earlier version? Saving back to an older file format version isn’t possible. What you can do in such a case is to <i>group</i> all items on every page and then copy each group to the Scrapbook, page by page. You can then send your Scrapbook to the person that uses the older version, because the Scrapbook format didn’t change between versions. Be aware, though, that <i>linked text frames</i> on different pages cannot be re-created this way: You’ll have to re-link them in the earlier version.</p> <p>While every newer version of Scribus can open files created in older versions, including SCD and SCD.GZ files saved by early 0.x versions from more than a decade ago, you should <b>always</b> check the text layout, because the Scribus text layout algorithms have changed significantly over time. This measure of caution is especially important with older file versions, but it is recommended to always check the text layout if you open the file on another computer or after a font upgrade. While Scribus always does a <a href="fonts2.html">font check</a> during startup, it does not check for different font versions when it opens a file. Thus, different font versions or fonts with the same PostScript font name, but from different vendors/sources may result in broken text layout, e.g. unintended text overflow.</p> diff --git a/doc/en/readme-macosx.html b/doc/en/readme-macosx.html index 9701e969a..939c87836 100644 --- a/doc/en/readme-macosx.html +++ b/doc/en/readme-macosx.html @@ -24,7 +24,7 @@ </ul> <h3>Additional Software</h3> <ul> -<li>Scribus 1.4 provides a new type of frame, called <a href="WwRenderframes.html">Render Frame</a>. It enables the use of other programs to render their outpout in a Scribus document. To take full advantage of this feature, you need to install these programs. By default, Scribus is pre-configured to use <a href="http://www.tug.org/mactex/">LaTeX</a>, <a href="http://lilypond.org/web/install/">Lilypond</a>, <a href="http://www.povray.org/ftp/pub/povray/Official/Macintosh/povpmac.sit">POV-Ray</a>, <a href="http://www.pixelglow.com/graphviz/">Graphviz</a>, and <a href="http://lee-phillips.org/info/Macintosh/gnuplot.html">Gnuplot</a>. +<li>Scribus 1.4 provides a new type of frame, called <a href="WwRenderframes.html">Render Frame</a>. It enables the use of other programs to render their output in a Scribus document. To take full advantage of this feature, you need to install these programs. By default, Scribus is pre-configured to use <a href="http://www.tug.org/mactex/">LaTeX</a>, <a href="http://lilypond.org/web/install/">Lilypond</a>, <a href="http://www.povray.org/ftp/pub/povray/Official/Macintosh/povpmac.sit">POV-Ray</a>, <a href="http://www.pixelglow.com/graphviz/">Graphviz</a>, and <a href="http://lee-phillips.org/info/Macintosh/gnuplot.html">Gnuplot</a>. </li> </ul> </body></html> diff --git a/doc/en/readme.html b/doc/en/readme.html index f6e6d332d..a20121ce9 100644 --- a/doc/en/readme.html +++ b/doc/en/readme.html @@ -45,7 +45,7 @@ <ul> <li>Background colors for glyphs.</li> <li>Foot- and endnotes.</li> -<li>Freely defineable text variables.</li> +<li>Freely definable text variables.</li> <li>Text references.</li> <li>Anchored text frames.</li> <li>Automatic numbering and bullets.</li> @@ -301,7 +301,7 @@ <ul> <li><b>New icon sets:</b> As of version 1.5.1 Scribus uses a new and modern icon set. It's mostly in black and uses color only where necessary. A bright icon set suitable to dark UIs has been added as well.</li> <li><b>Docked palettes:</b> All palettes can now be docked to the right or left side of the screen space.</li> -<li><b>Context-sensitive Palette:</b> The Properties Palette has become a bit hard to use, due its many added functions. As as of version 1.5.6 all item-type-specific options have been removed from the PP. They are now available in a separate palette that will change its apperance depending on the kind of object you have selected.</li> +<li><b>Context-sensitive Palette:</b> The Properties Palette has become a bit hard to use, due its many added functions. As as of version 1.5.6 all item-type-specific options have been removed from the PP. They are now available in a separate palette that will change its appearance depending on the kind of object you have selected.</li> <li><b>Menu bar:</b> The menu bar has been restructured and now takes less screen estate, as well as being much more clearly arranged.</li> <li><b>Context menu:</b> The context menu has been redesigned and is now much smaller.</li> <li><b>Visual feedback for rejected fonts:</b> As of version 1.5.6, you don't need to start Scribus from the command line to see which fonts where rejected by Scribus. In the font manager you'll find a new tab called "Rejected Fonts", which list all of them (if any).</li> diff --git a/doc/en/scripterapi-ImageExport.html b/doc/en/scripterapi-ImageExport.html index ee7d74957..e674fa0e6 100644 --- a/doc/en/scripterapi-ImageExport.html +++ b/doc/en/scripterapi-ImageExport.html @@ -59,7 +59,7 @@ i.save()<br/> <dd><p>Filename of the image. With or without path. Read/write string.</p></dd> <dt><strong>quality</strong> = <member 'quality' of 'ImageExport' objects></dt> - <dd><p>Quality/compression: minimum 1 (poor), maximum 100 (qaulity). Read/write integer.</p></dd> + <dd><p>Quality/compression: minimum 1 (poor), maximum 100 (quality). Read/write integer.</p></dd> <dt><strong>scale</strong> = <member 'scale' of 'ImageExport' objects></dt> <dd><p>This is the scaling of the image. 100 = 100% etc. Read/write integer.</p></dd> diff --git a/doc/en/scripterapi-PDFfile.html b/doc/en/scripterapi-PDFfile.html index e57c31907..63ec410f7 100644 --- a/doc/en/scripterapi-PDFfile.html +++ b/doc/en/scripterapi-PDFfile.html @@ -145,7 +145,7 @@ This does *not* yet take care of colorspaces, so you should know what you are do Bool value.</p></dd> <dt><strong>encrypt</strong> = <member 'encrypt' of 'PDFfile' objects></dt> -<dd><p>Use Encription. Bool value</p></dd> +<dd><p>Use Encryption. Bool value</p></dd> <dt><strong>file</strong> = <attribute 'file' of 'PDFfile' objects></dt> <dd><p>Name of file to save into</p></dd> diff --git a/doc/en/scripterapi-dialogs.html b/doc/en/scripterapi-dialogs.html index 433e39015..e2d81bf5a 100644 --- a/doc/en/scripterapi-dialogs.html +++ b/doc/en/scripterapi-dialogs.html @@ -13,7 +13,7 @@ <dt><a name="-fileDialog"><strong>fileDialog</strong></a>(...)</dt> <dd><code>fileDialog("caption", ["filter", "defaultname", haspreview, issave, isdir])<br> -> string with filename</code> -<p>Shows a File Open dialog box with the caption "caption". Files are filtered with the filter string "filter". A default filename or file path can also supplied, leave this string empty when you don't want to use it. A value of True for haspreview enables a small preview widget in the FileSelect box. When the issave parameter is set to True the dialog acts like a "Save As" dialog otherwise it acts like a "File Open Dialog". When the isdir parameter is True the dialog shows and returns only directories. The default for all of the opional parameters is False.<p> +<p>Shows a File Open dialog box with the caption "caption". Files are filtered with the filter string "filter". A default filename or file path can also supplied, leave this string empty when you don't want to use it. A value of True for haspreview enables a small preview widget in the FileSelect box. When the issave parameter is set to True the dialog acts like a "Save As" dialog otherwise it acts like a "File Open Dialog". When the isdir parameter is True the dialog shows and returns only directories. The default for all of the optional parameters is False.<p> <p>The filter, if specified, takes the form 'comment (*.type *.type2 ...)'. For example 'Images (*.png *.xpm *.jpg)'.</p> <p>Refer to the Qt-Documentation for QFileDialog for details on filters.</p> <p>Examples:</p> diff --git a/doc/en/scripterapi-getobjprop.html b/doc/en/scripterapi-getobjprop.html index 88ee72b71..97797013a 100644 --- a/doc/en/scripterapi-getobjprop.html +++ b/doc/en/scripterapi-getobjprop.html @@ -82,7 +82,7 @@ <p>Returns the name of the line color of the object "name". If "name" is not given the currently selected item is used.</p></dd> <dt><a name="-getLineJoin"><strong>getLineJoin</strong></a>(...)</dt> -<dd><code>getLineJoin(["name"]) -> integer (see contants)</code> +<dd><code>getLineJoin(["name"]) -> integer (see constants)</code> <p>Returns the line join style of the object "name". If "name" is not given the currently selected item is used. The join types are: JOIN_BEVEL, JOIN_MITTER, JOIN_ROUND</p></dd> <dt><a name="-getLineShade"><strong>getLineShade</strong></a>(...)</dt> diff --git a/doc/en/scripterapi-lines.html b/doc/en/scripterapi-lines.html index 5b138489e..17ff48369 100644 --- a/doc/en/scripterapi-lines.html +++ b/doc/en/scripterapi-lines.html @@ -40,7 +40,7 @@ <p>Returns the name of the line color of the object "name". If "name" is not given the currently selected item is used.</p></dd> <dt><a name="-getLineJoin"><strong>getLineJoin</strong></a>(...)</dt> -<dd><code>getLineJoin(["name"]) -> integer (see contants)</code> +<dd><code>getLineJoin(["name"]) -> integer (see constants)</code> <p>Returns the line join style of the object "name". If "name" is not given the currently selected item is used. The join types are: JOIN_BEVEL, JOIN_MITTER, JOIN_ROUND</p></dd> <dt><a name="-getLineShade"><strong>getLineShade</strong></a>(...)</dt> diff --git a/doc/en/settings1.html b/doc/en/settings1.html index a477a35fd..91c7c4bef 100644 --- a/doc/en/settings1.html +++ b/doc/en/settings1.html @@ -107,7 +107,7 @@ <p><img src="images/prefs_guides_tab1.png" align="center"></p> <p>The meaning of the box in the upper left is to depict the order of visibility of each kind of item. Here in the default situation, <strong>Content Objects</strong> show on top, then <strong>Guides</strong> will appear to be just under them, then the <strong>Grid</strong>, the <strong>Baseline Grid</strong>, and finally underneath everything, the <strong>Margins</strong>. To change this order, click to select one of these, then use the arrows to move it upward or downward in the stack.</p> <p>The <strong>Snap Distance</strong> applies when <em>Page > Snap to Guides</em> or <em>Page > Snap to Grid</em> has been selected. <strong>Grab Radius</strong> has to do with the size of the virtual space for grabbing and dragging a frame’s handles.</p> -<p>At the bottom, you can adjust the spacing of the Grid and tne Baseline Grid.</p> +<p>At the bottom, you can adjust the spacing of the Grid and the Baseline Grid.</p> <h4>Visibility</h4> <p><img src="images/prefs_guides_tab2.png" align="center"></p> <p>By default, Guides and Margins will show, and the Grid and Baseline Grid will not, but each default setting can be changed here.</p> diff --git a/doc/en/toolbox2.html b/doc/en/toolbox2.html index 658458db2..e83c3a61a 100644 --- a/doc/en/toolbox2.html +++ b/doc/en/toolbox2.html @@ -17,10 +17,10 @@ <h4>PDF Viewers for Haiku</h4> <p>Adobe has never released a version of Acrobat/Adobe Reader for BeOS or Haiku. As an alternative you can use <a href="http://sourceforge.net/projects/bepdf/?source=directory">BePDF</a> or <a href="http://haikuware.com/directory/view-details/productivity/utilities/documentviewer">DocumentViewer</a>.</p> <h3>PDF Editors</h3> -<p>PDF was and is designed as some kind of “electronic paper”, which means a PDF is not meant to be editable. But the more ubiquitous the PDF format became, the more use cases appeared, in which it made sense to edit “non-editable” files, e.g., last-minute corrections of spelling errors or the re-ordering of pages in a print workflow. The inventor of PDF, Adobe, took the lead and devoloped Acrobat, which is still the leading PDF editing program. However, since the PDF specification is open, others started to tinker as well, and today there are countless tools, closed source or open, that allow for editing PDF files. Below is a list of recommended FLOSS programs for PDF editing.</p> +<p>PDF was and is designed as some kind of “electronic paper”, which means a PDF is not meant to be editable. But the more ubiquitous the PDF format became, the more use cases appeared, in which it made sense to edit “non-editable” files, e.g., last-minute corrections of spelling errors or the re-ordering of pages in a print workflow. The inventor of PDF, Adobe, took the lead and developed Acrobat, which is still the leading PDF editing program. However, since the PDF specification is open, others started to tinker as well, and today there are countless tools, closed source or open, that allow for editing PDF files. Below is a list of recommended FLOSS programs for PDF editing.</p> <ul> <li><a href="http://multivalent.sourceforge.net">Multivalent</a> and the <a href="http://www.accesspdf.com/pdftk">PDF Toolkit (pdftk)</a> are both Java-based commandline utilities with countless options to manipulate PDFs.</li> -<li><a href="http://pdfedit.petricek.net/index_e.html">PDF Edit</a> is a collection of Qt scipts to manipulate PDFs, but the scripts are hidden behind a graphical user interface, so editing PDFs works in a WYSIWIG (“What you see is what you get”) mode. PDF Edit allows for many direct changes to the content of a PDF file, including changes to text or colors, as well as removing content. The program is based on Qt3, but as of this writing, the developers are working on a port to Qt4.</li> +<li><a href="http://pdfedit.petricek.net/index_e.html">PDF Edit</a> is a collection of Qt scripts to manipulate PDFs, but the scripts are hidden behind a graphical user interface, so editing PDFs works in a WYSIWIG (“What you see is what you get”) mode. PDF Edit allows for many direct changes to the content of a PDF file, including changes to text or colors, as well as removing content. The program is based on Qt3, but as of this writing, the developers are working on a port to Qt4.</li> <li><a href="http://jpdftweak.sourceforge.net">jPDF Tweak</a>, a Java program, has rightfully been called a Swiss army knife for PDFs. It uses the highly reliable iText library for PDF editing.</li><br> <table width="100%"><tr><td align="center"><img src="images/tb-jpdf.png" alt="jPDF Tweak" title="jPDF Tweak" /></td></tr></table><br> <li><a href="http://www.pdfsam.org">PDF Split and Merge (PDF SaM)</a> is an even more powerful tool than jPDF Tweak and has a proven track record in pre-press environments. PDF SaM is rather a tool for professionals, whereas beginners will probably be overwhelmed by its many options. Like jPDF Tweak, PDF SaM is a Java program, but in contrast to all other Java programs in this list, the language of the graphical user interface can be changed. and there are many translations available.</li> diff --git a/doc/en/toolbox20.html b/doc/en/toolbox20.html index 113f73b45..dc7444b53 100644 --- a/doc/en/toolbox20.html +++ b/doc/en/toolbox20.html @@ -8,7 +8,7 @@ </style> <body> <h2>DrawView</h2> -<p>In Great Britain, as well as the Commonwealth, the Acorn/RISC OS platform used to play an imortant role during the 90s and early 2000s. Being side-lined and becoming more or less a niche operating system doesn't take away the value of legacy Acorn/RISC OS graphics and files.</p> +<p>In Great Britain, as well as the Commonwealth, the Acorn/RISC OS platform used to play an important role during the 90s and early 2000s. Being side-lined and becoming more or less a niche operating system doesn't take away the value of legacy Acorn/RISC OS graphics and files.</p> <p>While <a href="importucv.html">UniConvertor</a> offers an import filter for AFF files, its capabilities are severely limited. Whether an AFF file can be imported into Scribus using UniConvertor remains a game of chance.</p> <p>Here's where <a href="http://www.keelhaul.me.uk/acorn/drawview/">DrawView</a> comes to the rescue. DrawView can open <b>all</b> Acorn Draw file types (AFF, C4B, C56, CC3). Moreover, DrawView can convert Acorn Draw files into either PostScript or PDF, and the export results can be flawlessly <a href="importoutput.html">imported</a> into Scribus.</p><br> <table width="100%"><tr><td align="center"><img src="images/drawview.png" alt="DrawView on Linux" title="DrawView on Linux" /></td></tr></table><br> diff --git a/doc/en/toolbox3.html b/doc/en/toolbox3.html index d906fe058..248cbbd5e 100644 --- a/doc/en/toolbox3.html +++ b/doc/en/toolbox3.html @@ -9,7 +9,7 @@ <body> <h2>Batik</h2> -<p>Batik is a collection of Apache XML modules for on the fly export/conversion of SVG. One of the really useful tools in the collection is <strong>Squiggle</strong>, a Java application for simply viewing SVG. It may be difficult to compile Batik on some distributions, but fortunately there are packages for all major distrubtions and operating systems available. </p> +<p>Batik is a collection of Apache XML modules for on the fly export/conversion of SVG. One of the really useful tools in the collection is <strong>Squiggle</strong>, a Java application for simply viewing SVG. It may be difficult to compile Batik on some distributions, but fortunately there are packages for all major distributions and operating systems available. </p> <p>Why bother? Call it the sober judge of SVG. Of all of the SVG viewers, it is probably one of, if not, the most spec-compliant viewers. If you receive or create an SVG and it won’t import properly, see how it looks in Batik. If it does not display properly it is more than likely an issue with the creating application. The exception to this are SVGs exported from Adobe Illustrator, which often have Adobe-only extensions included in the SVG file and may only be viewable in Adobe applications.</p> diff --git a/doc/en/topten.html b/doc/en/topten.html index 0e52efaee..43713167b 100644 --- a/doc/en/topten.html +++ b/doc/en/topten.html @@ -53,7 +53,7 @@ Almost every spinbox where you enter values with measurements can magically do m <br /> <ul> <li><strong>Bonus</strong> - subscribe to the Scribus mailing list. You can get this in digest form daily. The list is active, polite and newbies and experts alike are welcome. Do not be shy to ask questions, Linux gurus might be new to DTP and vice versa. <a href="http://lists.scribus.info/mailman/listinfo/scribus">Scribus Mailing List Info</a> If you have tips you would like to share post them to the list. We will ensure they are considered and credited properly.</li> -<li><strong>Extra Bonus</strong> - How to ask questions and file bug reports/issues on the mailing list? First, in newer versions go to <strong>Help > About </strong> and include the build info. <a href="menuhelp.html">More details</a> Then, look in the <a href="http://lists.scribus.info/pipermail/scribus/">mailing list archives</a> or on the <a href="http://bugs.scribus.net">Bug Tracker</a>, you might find your answer there. Then, make sure you add relevant details like which distribution, version of Scribus, versions of relevant packages or libraries. e.g. version of X-org if you have video or font issues. This helps the developers and other knowledgable users to respond quicker and more accurately. <strong>Note:</strong> If you are using a CVS version of Scribus, please also include the build date.</li> +<li><strong>Extra Bonus</strong> - How to ask questions and file bug reports/issues on the mailing list? First, in newer versions go to <strong>Help > About </strong> and include the build info. <a href="menuhelp.html">More details</a> Then, look in the <a href="http://lists.scribus.info/pipermail/scribus/">mailing list archives</a> or on the <a href="http://bugs.scribus.net">Bug Tracker</a>, you might find your answer there. Then, make sure you add relevant details like which distribution, version of Scribus, versions of relevant packages or libraries. e.g. version of X-org if you have video or font issues. This helps the developers and other knowledgeable users to respond quicker and more accurately. <strong>Note:</strong> If you are using a CVS version of Scribus, please also include the build date.</li> </ul> </body> </html> diff --git a/scribus/actionmanager.cpp b/scribus/actionmanager.cpp index b97099d23..42322acda 100644 --- a/scribus/actionmanager.cpp +++ b/scribus/actionmanager.cpp @@ -1629,7 +1629,7 @@ void ActionManager::languageChange() (*scrActions)["itemSplitPolygons"]->setTexts( tr("Split &Polygons")); (*scrActions)["itemConvertToBezierCurve"]->setTexts( tr("&Bezier Curve")); (*scrActions)["itemConvertToImageFrame"]->setTexts( tr("&Image Frame")); - (*scrActions)["itemConvertToOutlines"]->setTexts( tr("&Outlines", "Convert to oulines")); + (*scrActions)["itemConvertToOutlines"]->setTexts( tr("&Outlines", "Convert to outlines")); (*scrActions)["itemConvertToPolygon"]->setTexts( tr("&Polygon")); (*scrActions)["itemConvertToTextFrame"]->setTexts( tr("&Text Frame")); (*scrActions)["itemConvertToSymbolFrame"]->setTexts( tr("&Symbol")); diff --git a/scribus/canvasgesture_linemove.h b/scribus/canvasgesture_linemove.h index 3f9a847a4..1dc6e0f28 100644 --- a/scribus/canvasgesture_linemove.h +++ b/scribus/canvasgesture_linemove.h @@ -45,7 +45,7 @@ class PageItem_Line; When the parent mode becomes active again, it can retrieve the new line with endPoint(). - If the constructur with a pageitem is used, the gesture will change the item directly. + If the constructor with a pageitem is used, the gesture will change the item directly. */ class SCRIBUS_API LineMove : public CanvasGesture { diff --git a/scribus/colorblind.h b/scribus/colorblind.h index f3b58a288..a6ff681b1 100644 --- a/scribus/colorblind.h +++ b/scribus/colorblind.h @@ -139,7 +139,7 @@ private: The RGB<->LMS transforms are computed from the human cone photo-pigment absorption spectra and the monitor phosphor emission spectra. These parameters are fairly constant for most - humans and most montiors (at least for modern CRTs). However, + humans and most monitors (at least for modern CRTs). However, gamma will vary quite a bit, as it is a property of the monitor (eg. amplifier gain), the video card, and even the software. Further, users can adjust their gammas (either via @@ -147,7 +147,7 @@ private: following are the gamma estimates that we have used in the Vischeck code. Many colorblind users have viewed our simulations and told us that they "work" (simulated and original images are - indistinguishabled). + indistinguishable). */ void init(); diff --git a/scribus/commonstrings.h b/scribus/commonstrings.h index 2b67ceb49..05006846a 100644 --- a/scribus/commonstrings.h +++ b/scribus/commonstrings.h @@ -43,7 +43,7 @@ class QEvent; done initially. trNone = tr("None") was removed because it's problematic in - East European langiages. + East European languages. */ class SCRIBUS_API CommonStrings : public QObject { diff --git a/scribus/desaxe/simple_actions.h b/scribus/desaxe/simple_actions.h index 11af472d3..90ee44fd5 100644 --- a/scribus/desaxe/simple_actions.h +++ b/scribus/desaxe/simple_actions.h @@ -608,7 +608,7 @@ struct Store : public MakeAction<Store_body<Type>, const Xml_string& > * the digester's storage, the topmost object is also stored there. Then the * trigger "WithinIdRef" is set during begin() and the processing continues * normally. When end() is called, the topmost object is replaced by the - * stored one (this will be a no-op if there wasnt an entry in storage before) + * stored one (this will be a no-op if there wasn't an entry in storage before) */ template<class Obj_Type> class IdRef_body : public Action_body diff --git a/scribus/exif.cpp b/scribus/exif.cpp index 9eebd31b1..7c4574350 100644 --- a/scribus/exif.cpp +++ b/scribus/exif.cpp @@ -572,7 +572,7 @@ void ExifData::ProcessExifDir ( unsigned char * DirStart, unsigned char * Offset case TAG_FNUMBER: // Simplest way of expressing aperture, so I trust it the most. - // (overwrite previously computd value if there is one) + // (overwrite previously computed value if there is one) ExifData::ApertureFNumber = ( float ) ConvertAnyFormat ( ValuePtr, Format ); break; @@ -594,14 +594,14 @@ void ExifData::ProcessExifDir ( unsigned char * DirStart, unsigned char * Offset break; case TAG_SUBJECT_DISTANCE: - // Inidcates the distacne the autofocus camera is focused to. + // Indicates the distance the autofocus camera is focused to. // Tends to be less accurate as distance increases. ExifData::Distance = ( float ) ConvertAnyFormat ( ValuePtr, Format ); break; case TAG_EXPOSURETIME: // Simplest way of expressing exposure time, so I trust it most. - // (overwrite previously computd value if there is one) + // (overwrite previously computed value if there is one) ExifData::ExposureTime = ( float ) ConvertAnyFormat ( ValuePtr, Format ); break; diff --git a/scribus/fileloader.cpp b/scribus/fileloader.cpp index ce97bb4bb..e76ca686b 100644 --- a/scribus/fileloader.cpp +++ b/scribus/fileloader.cpp @@ -199,7 +199,7 @@ bool FileLoader::loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, const \date \brief Loads the file "FileName" as a Scribus document \param currDoc the current document - \retval bool true when loading is succsessful, false otherwise + \retval bool true when loading is successful, false otherwise */ bool FileLoader::loadFile(ScribusDoc* currDoc) { diff --git a/scribus/fonts/scface.h b/scribus/fonts/scface.h index 16c790e51..17bbba612 100644 --- a/scribus/fonts/scface.h +++ b/scribus/fonts/scface.h @@ -260,7 +260,7 @@ public: /// check if this is a replacement font bool isReplacement() const { return !m_replacedName.isEmpty(); } - /// makes a repalcement font for font "name" using this fonts data + /// makes a replacement font for font "name" using this fonts data ScFace mkReplacementFor(const QString& name, const QString& doc) { ScFace result(m_m); result.m_replacedName = name; diff --git a/scribus/fonts/scfontmetrics.cpp b/scribus/fonts/scfontmetrics.cpp index 2624da884..5108d336e 100644 --- a/scribus/fonts/scfontmetrics.cpp +++ b/scribus/fonts/scfontmetrics.cpp @@ -173,7 +173,7 @@ int setBestEncoding(FT_Face face) FPointArray traceGlyph(FT_Face face, ScFace::gid_type glyphIndex, int chs, qreal *x, qreal *y, bool *err) { bool error = false; - //AV: not threadsave, but tracechar is only used in ReadMetrics() and fontSample() + //AV: not threadsafe, but tracechar is only used in ReadMetrics() and fontSample() static FPointArray pts; pts.resize(0); FPointArray pts2; diff --git a/scribus/loadsaveplugin.h b/scribus/loadsaveplugin.h index ae091d2e8..90db6b4c9 100644 --- a/scribus/loadsaveplugin.h +++ b/scribus/loadsaveplugin.h @@ -236,7 +236,7 @@ class SCRIBUS_API FileFormat // // Data members // - // An integer ID code used to idenfify formats. Should be unique + // An integer ID code used to identify formats. Should be unique // across all FileFormat structures except where they implement // support for the same file format, eg sla 1.2.x, sla 1.3.x and // "new format" SLA should all have equal IDs (with different diff --git a/scribus/manager/dock_manager.h b/scribus/manager/dock_manager.h index 893e54355..4a53129ae 100644 --- a/scribus/manager/dock_manager.h +++ b/scribus/manager/dock_manager.h @@ -72,7 +72,7 @@ public: */ void toggleDocksVisibility(); /** - * @brief Retruns true if all docks are temporary hidden. + * @brief Returns true if all docks are temporary hidden. * @return */ bool hasTemporaryHiddenDocks(); diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp index 42fe677e9..a15205423 100644 --- a/scribus/pdflib_core.cpp +++ b/scribus/pdflib_core.cpp @@ -4301,7 +4301,7 @@ QByteArray PDFLibCore::PDF_PutSoftShadow(PageItem* ite) /** * Fill this.output with the QByteArray representation of the item. - * Checks if the item can be represented in the chosen PDF version, based on some of its caracteristics + * Checks if the item can be represented in the chosen PDF version, based on some of its characteristics * and delegates the work to PDF_Image, PDF_GradientFillStroke, PDF_PatternFillStroke and so on for * filling this.output. * Returns false if the content can't be represented in the chosen PDF version, diff --git a/scribus/plugins/fontpreview/fontpreview.h b/scribus/plugins/fontpreview/fontpreview.h index 190ed21a9..bd194bbf3 100644 --- a/scribus/plugins/fontpreview/fontpreview.h +++ b/scribus/plugins/fontpreview/fontpreview.h @@ -64,7 +64,7 @@ protected: QSortFilterProxyModel * m_proxyModel { nullptr }; /*! \brief Create a pixmap sample with font preview. - With GUI oprions. */ + With GUI options. */ void paintSample(); /*! \brief Check if is there any item in list to prevent crashes. diff --git a/scribus/plugins/import/idml_old/importidmlimpl.cpp b/scribus/plugins/import/idml_old/importidmlimpl.cpp index 212ede971..0f4fb4b05 100644 --- a/scribus/plugins/import/idml_old/importidmlimpl.cpp +++ b/scribus/plugins/import/idml_old/importidmlimpl.cpp @@ -76,7 +76,7 @@ bool ImportIdmlImpl::run(const QString & target, ScribusDoc* doc) /* Implement Progress Dialog Later */ /** - Here, first we parse the idml document, in the order designmap.xml,preferences.xml, fonts.xml, styles.xml, gradiant.xml, all the stories will be transformed into Story Objects, and finally all the master spreads and spreads. + Here, first we parse the idml document, in the order designmap.xml,preferences.xml, fonts.xml, styles.xml, gradient.xml, all the stories will be transformed into Story Objects, and finally all the master spreads and spreads. We set the document page width, height etc from preferences.xml, styles are defined and added into the list. QMap are maintained with QString, Object for each item which is referred later in the document using the self attribute. This includes all styles, stories etc. @@ -695,7 +695,7 @@ void ImportIdmlImpl::addTextFrame(ScribusDoc* doc, QDomNode node) StrokeColor = CommonStrings::None; ItemLayer = elem.attribute("ItemLayer",""); itemTransform = applyTransform(elem.attribute("ItemTranform","")); - /* Try to add gradiant feature */ + /* Try to add gradient feature */ } //Reading the properties QList<PathPoint> pathPoints; diff --git a/scribus/plugins/scripter/python/mikro.py b/scribus/plugins/scripter/python/mikro.py index 27451a8d0..a14b756dc 100644 --- a/scribus/plugins/scripter/python/mikro.py +++ b/scribus/plugins/scripter/python/mikro.py @@ -57,7 +57,7 @@ def from_variantlist(variantlist): def classname(obj): """ return real class name - Unwrapped classes will be represended in PyQt by a known base class. + Unwrapped classes will be represented in PyQt by a known base class. So obj.__class__.__name__ will not return the desired class name """ return obj.metaObject().className() @@ -113,7 +113,7 @@ def wrap(obj, force=False): """ If a class is not known by PyQt it will be automatically casted to a known wrapped super class. - But that limits access to methods and propperties of this super class. + But that limits access to methods and properties of this super class. So instead this functions returns a wrapper class (PyQtClass) which queries the metaObject and provides access to all slots and all properties. @@ -176,13 +176,13 @@ def is_scripter_child(qobj): return found - -class Error(Exception): - """ - Base error classed. Catch this to handle exceptions coming from c++ - """ - - + +class Error(Exception): + """ + Base error classed. Catch this to handle exceptions coming from c++ + """ + + class PyQtClass(object): """ @@ -432,13 +432,13 @@ def create_pyqt_class(metaobject): def create_pyqt_object(obj): """ Wrap a QObject and make all slots and properties dynamically available. - @type obj: QObject - @param obj: an unwrapped QObject - @rtype: PyQtClass object - @return: dynamically created object with all available properties and slots - - This is probably the only function you need from this module. - Everything else are helper functions and classes. + @type obj: QObject + @param obj: an unwrapped QObject + @rtype: PyQtClass object + @return: dynamically created object with all available properties and slots + + This is probably the only function you need from this module. + Everything else are helper functions and classes. """ cls = create_pyqt_class(obj.metaObject()) return cls(obj) diff --git a/scribus/plugins/scriptplugin/cmdgetsetprop.cpp b/scribus/plugins/scriptplugin/cmdgetsetprop.cpp index edb7a32a9..f0c4d4ab8 100644 --- a/scribus/plugins/scriptplugin/cmdgetsetprop.cpp +++ b/scribus/plugins/scriptplugin/cmdgetsetprop.cpp @@ -361,14 +361,14 @@ PyObject* scribus_setproperty(PyObject* /*self*/, PyObject* args, PyObject* kw) // Did we know how to convert the value argument to the right type? bool matched = false; - // Did the set call succceed? + // Did the set call succeed? bool success = false; // Check the C++ type of the property, and try to convert the passed // PyObject to something sensible looking for it. // FIXME: handle enums/sets // NUMERIC TYPES - // These are unfortuately a TOTAL PITA because of the multitude of + // These are unfortunately a TOTAL PITA because of the multitude of // C and Python numeric types. TODO This needs to be broken out into a subroutine. if (propertyType == "bool") { diff --git a/scribus/plugins/scriptplugin/objimageexport.h b/scribus/plugins/scriptplugin/objimageexport.h index 0ec7d7c17..53beedae4 100644 --- a/scribus/plugins/scriptplugin/objimageexport.h +++ b/scribus/plugins/scriptplugin/objimageexport.h @@ -31,7 +31,7 @@ i.saveAs('/home/subik/test.png')"); PyDoc_STRVAR(imgexp_alltypes__doc__, "Available image types. Read only list of strings."); PyDoc_STRVAR(imgexp_dpi__doc__, "This value will be used for export as DPI. Read/write integer."); PyDoc_STRVAR(imgexp_filename__doc__, "Filename of the image. With or without path. Read/write string."); -PyDoc_STRVAR(imgexp_quality__doc__, "Quality/compression: minimum 1 (poor), maximum 100 (qaulity). Read/write integer."); +PyDoc_STRVAR(imgexp_quality__doc__, "Quality/compression: minimum 1 (poor), maximum 100 (quality). Read/write integer."); PyDoc_STRVAR(imgexp_scale__doc__, "This is the scaling of the image. 100 = 100% etc. Read/write integer."); PyDoc_STRVAR(imgexp_transparentBkgnd__doc__, "Enable or disable transparent background."); PyDoc_STRVAR(imgexp_type__doc__, "Bitmap type. See allTypes list for more info. Read/write string."); diff --git a/scribus/plugins/scriptplugin/objpdffile.cpp b/scribus/plugins/scriptplugin/objpdffile.cpp index df85ce27e..f2b2ac4ff 100644 --- a/scribus/plugins/scriptplugin/objpdffile.cpp +++ b/scribus/plugins/scriptplugin/objpdffile.cpp @@ -744,7 +744,7 @@ static PyMemberDef PDFfile_members[] = { { "binding", T_INT, offsetof(PDFfile, binding), 0, "Choose binding.\n\t0 - Left binding\n\t1 - Right binding" }, { "presentation", T_INT, offsetof(PDFfile, presentation), 0, "Enable Presentation Effects.Bool value" }, { "article", T_INT, offsetof(PDFfile, article), 0, "Save Linked Text Frames as PDF Articles\n\tBool value" }, - { "encrypt", T_INT, offsetof(PDFfile, encrypt), 0, "Use Encription. Bool value" }, + { "encrypt", T_INT, offsetof(PDFfile, encrypt), 0, "Use Encryption. Bool value" }, { "uselpi", T_INT, offsetof(PDFfile, uselpi), 0, "Use Custom Rendering Settings. Bool value" }, { "usespot", T_INT, offsetof(PDFfile, usespot), 0, "Use Spot Colors. Bool value" }, { "domulti", T_INT, offsetof(PDFfile, domulti), 0, "Produce a PDF File for every Page. Bool value" }, diff --git a/scribus/plugins/scriptplugin/objprinter.cpp b/scribus/plugins/scriptplugin/objprinter.cpp index c12eaaf17..60428f691 100644 --- a/scribus/plugins/scriptplugin/objprinter.cpp +++ b/scribus/plugins/scriptplugin/objprinter.cpp @@ -42,7 +42,7 @@ struct Printer PyObject *file; // string - name of file to print into (eg. output.ps) PyObject *cmd; // string - if "" use standard command else use this as command (eg. "kprinter", "xpp" ...) PyObject *pages; // list of integers - pages to be printed - int copies; // numer of printed copies + int copies; // number of printed copies PyObject *separation; // string - No; All; Cyan; Magenta; Yellow; Black int color; // bool - do we print in color=1 or greyscale=0 int useICC; // bool - do we use ICC Profiles 0 = No 1 = Yes diff --git a/scribus/plugins/scriptplugin/pconsole.h b/scribus/plugins/scriptplugin/pconsole.h index 1e78b0ba1..7e25c471f 100644 --- a/scribus/plugins/scriptplugin/pconsole.h +++ b/scribus/plugins/scriptplugin/pconsole.h @@ -85,7 +85,7 @@ class PythonConsole : public QMainWindow, public Ui::PythonConsole }; -/*! \brief Store colors for syntax highligter. +/*! \brief Store colors for syntax highlighter. It provides defaults, loading and storing preferences. \author Petr Vanek <petr@yarpen.cz> */ class SyntaxColors diff --git a/scribus/plugins/scriptplugin/scripter2/scripter2_qttype_qstring.cpp b/scribus/plugins/scriptplugin/scripter2/scripter2_qttype_qstring.cpp index 8672ddd67..04a859986 100644 --- a/scribus/plugins/scriptplugin/scripter2/scripter2_qttype_qstring.cpp +++ b/scribus/plugins/scriptplugin/scripter2/scripter2_qttype_qstring.cpp @@ -26,7 +26,7 @@ struct QString_to_python_unicode convert(QString const& s) { //FIXME: Done with Python/C API, needs Boost::Python-ifying - //FIXME: UCS-4 case can probably be done a lot more effciently. + //FIXME: UCS-4 case can probably be done a lot more efficiently. #if defined(Py_UNICODE_WIDE) //qDebug("Py_UNICODE_WIDE"); int unichars = s.length(); diff --git a/scribus/plugins/scriptplugin/scriptpaths.cpp b/scribus/plugins/scriptplugin/scriptpaths.cpp index 428c10b8e..8722f8ad3 100644 --- a/scribus/plugins/scriptplugin/scriptpaths.cpp +++ b/scribus/plugins/scriptplugin/scriptpaths.cpp @@ -47,7 +47,7 @@ void ScriptPaths::buildMenu() for (const auto& scriptInfo: scriptsList) { - // TODO: strippedName sould be unique for the whole menu (repo index + script name?)... we could use the full path... + // TODO: strippedName should be unique for the whole menu (repo index + script name?)... we could use the full path... auto scriptName = scriptInfo.name; scriptName.replace('_', ' '); scriptName = scriptName.first(1).toUpper() + scriptName.mid(1); diff --git a/scribus/plugins/scriptplugin/scripts/CalendarWizard.py b/scribus/plugins/scriptplugin/scripts/CalendarWizard.py index d031ab84e..a9c4ac7cf 100644 --- a/scribus/plugins/scriptplugin/scripts/CalendarWizard.py +++ b/scribus/plugins/scriptplugin/scripts/CalendarWizard.py @@ -600,7 +600,7 @@ class TkCalendar(Frame): self.realLangChange(lang=self.langListbox.get(ix[0])) def realLangChange(self, lang='English'): - """ Real widget setup. Ot takes values from localization dictionary. + """ Real widget setup. It takes values from localization dictionary. [0] = months, [1] Days """ self.key = lang self.monthListbox.delete(0, END) diff --git a/scribus/plugins/scriptplugin/scripts/FrenchAutotypo.py b/scribus/plugins/scriptplugin/scripts/FrenchAutotypo.py index 565dd198d..0397ed20b 100644 --- a/scribus/plugins/scriptplugin/scripts/FrenchAutotypo.py +++ b/scribus/plugins/scriptplugin/scripts/FrenchAutotypo.py @@ -3,7 +3,7 @@ # File: fr_autotypo².py Version : 1.1.3 - 2023 10 18 # Fixes typewriter, single and double quotes along with their leading and following spaces # + fixes double spaces everywhere -# + applies french typography (since default langage is french) +# + applies french typography (since default language is french) # # © 2020.06 Creation of autotypo by JLuc # following © 2013 autoquote2 enhancements by JLuc @@ -19,26 +19,26 @@ # INPUTS # - choose a text frame, launch script -# - it defaults to french but altering the script enables to choose other language or painfull interactive mode +# - it defaults to french but altering the script enables to choose other language or painful interactive mode # - default space to add for typography is thin nonbreakable space. # - existing spaces should be replaced # - multiple spaces should be merged into single space # FEATURES # - replaces " with « and » as required # - warns when « and » dont match or for other such issues -# - adds choosen spaces after « and before » +# - adds chosen spaces after « and before » # - applies some heuristics (some would call that AI) to best deal with ' and " # - replace multiple following spaces with just one -# - when langages is french, does more typography job : -# - - replaces or adds the choosen space before ! ? ; : and … -# - - doesnt mess urls = doesnt change http://scribus.net -# - - only adds one choosen space before a set of double spaces as !!!?! +# - when language is french, does more typographical actions: +# - - replaces or adds the chosen space before ! ? ; : and … +# - - doesn't mess urls = doesn't change http://scribus.net +# - - only adds one chosen space before a set of double spaces as !!!?! # - provides a just-go-ahead-dont-ask-for-options mode for geeks : juste change do_ask value to False in script # LIMITS # - recognizes urls with "p:/" or "ww." patterns (=> possible false positive) -# - same choosen space for « » ; ! ; : … +# - same chosen space for « » ; ! ; : … # - space is added or replaced with absolutely no local-font awareness -# - only manages selected frame and doesnt follow links accross linked text frames <-- PR wanted +# - only manages selected frame and doesn't follow links across linked text frames <-- PR wanted import scribus @@ -75,7 +75,7 @@ if scribus.haveDoc() <= 0: sys.exit(2) # -# First choice for langage +# First choice for language # if do_ask: lang = scribus.valueDialog("Language", 'Choose language or country\nChoisissez la langue du texte ou le pays :\n af, be, ch, cs, de, de-g, en, es, et, fi, fr,\n hu, is, lt, mk, nl, pl, ru, se, sk, sl, sq and uk', 'fr') diff --git a/scribus/plugins/scriptplugin/scripts/Ligatursatz.py b/scribus/plugins/scriptplugin/scripts/Ligatursatz.py index 0870f8ed5..7f5ef1c52 100644 --- a/scribus/plugins/scriptplugin/scripts/Ligatursatz.py +++ b/scribus/plugins/scriptplugin/scripts/Ligatursatz.py @@ -22257,8 +22257,8 @@ zzug4 u"ẞ" # U+017F LATIN SMALL LETTER LONG S u"ſ" - # combing chararacters - # (normalization support, canonical decompositon) + # combining characters + # (normalization support, canonical decomposition) u"\u030C\u0302\u0308\u0301\u0300\u030A\u0303\u0327") diff --git a/scribus/prefsstructs.h b/scribus/prefsstructs.h index 04ca7a01e..9e8d23c89 100644 --- a/scribus/prefsstructs.h +++ b/scribus/prefsstructs.h @@ -125,7 +125,7 @@ struct UIPrefs QString userPreferredLocale; //! System or interface language number formats bool useSmallWidgets {false}; //! Use small widgets in the palettes bool showLabels {true}; //! Hide UI additional labels (Professional Mode) - bool showLabelsOfInactiveTabs {true}; //! Hide text label of inactive tabs of Adavanced Docking System + bool showLabelsOfInactiveTabs {true}; //! Hide text label of inactive tabs of Advanced Docking System bool useTabs {false}; //! Use a tabbed MainWidget a la FireFox bool showStartupDialog {true}; //! Whether to show the startup dialog or not bool showSplashOnStartup {true}; //! Whether to show the splashscreen or not diff --git a/scribus/sccolor.h b/scribus/sccolor.h index 3c8a89e3c..67b3e4c3c 100644 --- a/scribus/sccolor.h +++ b/scribus/sccolor.h @@ -172,7 +172,7 @@ public: ColorList& operator= (const ColorList& list); - /** \brief Get the document the list is related , return in cpp due to scribusdoc class delcaration */ + /** \brief Get the document the list is related , return in cpp due to scribusdoc class declaration */ ScribusDoc* document() const; /** \brief Assign the doc to which the list belong to.*/ diff --git a/scribus/scpageoutput.cpp b/scribus/scpageoutput.cpp index 17efbf72a..6ac30b29b 100644 --- a/scribus/scpageoutput.cpp +++ b/scribus/scpageoutput.cpp @@ -516,7 +516,7 @@ void ScPageOutput::drawPattern(PageItem* item, ScPainterExBase* painter, const Q const ScPattern& pattern = m_doc->docPatterns[item->pattern()]; const ScPatternTransform& patternTrans = item->patternTransform(); - // Compute pattern tansformation matrix and its inverse for converting pattern coordinates + // Compute pattern transformation matrix and its inverse for converting pattern coordinates // to pageitem coordinates QTransform matrix; matrix.translate(patternTrans.offsetX, patternTrans.offsetY); diff --git a/scribus/scplugin.h b/scribus/scplugin.h index 51ceeb46b..c6ad31e63 100644 --- a/scribus/scplugin.h +++ b/scribus/scplugin.h @@ -446,7 +446,7 @@ class SCRIBUS_API ScActionPlugin : public ScPlugin * * Such plug-ins have an init method and a cleanup method; they have * no "run" method as such. It is up to the plugin to determine how - * best to interfact with the user. + * best to interact with the user. */ class SCRIBUS_API ScPersistentPlugin : public ScPlugin { diff --git a/scribus/storyloader.cpp b/scribus/storyloader.cpp index 793f1a5c1..a9973ede2 100644 --- a/scribus/storyloader.cpp +++ b/scribus/storyloader.cpp @@ -89,7 +89,7 @@ int StoryLoader::testData(const QByteArray& storyData) const \date \brief Loads the file "FileName" as a Scribus document \param currDoc the current document - \retval bool true when loading is succsessful, false otherwise + \retval bool true when loading is successful, false otherwise */ bool StoryLoader::loadStory(const QByteArray& storyData, ScribusDoc& doc, StoryText &story, PageItem* item) { diff --git a/scribus/styles/paragraphstyle.h b/scribus/styles/paragraphstyle.h index 64bf622b8..fcd906034 100644 --- a/scribus/styles/paragraphstyle.h +++ b/scribus/styles/paragraphstyle.h @@ -151,7 +151,7 @@ public: #include "paragraphstyle.attrdefs.cxx" #undef ATTRDEF - /** isInherited: returns true if the attriute is inherited */ + /** isInherited: returns true if the attribute is inherited */ #define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \ bool isInh##attr_NAME() const { return inh_##attr_NAME; } #include "paragraphstyle.attrdefs.cxx" diff --git a/scribus/text/design.txt b/scribus/text/design.txt index 2ab7e8305..c0fd31171 100644 --- a/scribus/text/design.txt +++ b/scribus/text/design.txt @@ -35,10 +35,10 @@ Currently the class TextShaper is the only class which actually shapes text. It level 4: layout -The input is a sequence of ShapedText objects and a text context. The text context determines the page area where the text shall be placed and other state information like current page number, current chapter, counters, and override styles for teh current frame (nyi) +The input is a sequence of ShapedText objects and a text context. The text context determines the page area where the text shall be placed and other state information like current page number, current chapter, counters, and override styles for the current frame (nyi) The output is a tree of boxes, which is encapsulated in the class TextLayout. TextLayout provides methods for mapping screen coordinates to text positions and vice versa, line navigation and other tasks which require the visual layout. A textlayout is usually linked to a page item and caches all information needed for rendering text. -Box classes are GroupBoxes for lines and blocks, GlyphBoxes for runs of glyphs and ObjetBoxes for inline frames. +Box classes are GroupBoxes for lines and blocks, GlyphBoxes for runs of glyphs and ObjectBoxes for inline frames. Advanced caching diff --git a/scribus/text/scrptrun.cc b/scribus/text/scrptrun.cc index 60338b625..78cb32820 100644 --- a/scribus/text/scrptrun.cc +++ b/scribus/text/scrptrun.cc @@ -165,7 +165,7 @@ UBool ScriptRun::next() // if it's an open character, push it onto the stack. // if it's a close character, find the matching open on the // stack, and use that script code. Any non-matching open - // characters above it on the stack will be poped. + // characters above it on the stack will be popped. if (pairIndex >= 0) { if ((pairIndex & 1) == 0) { ++parenSP; diff --git a/scribus/text/scrptrun.cpp b/scribus/text/scrptrun.cpp index 84b517572..a8964df80 100644 --- a/scribus/text/scrptrun.cpp +++ b/scribus/text/scrptrun.cpp @@ -166,7 +166,7 @@ UBool ScriptRun::next() // if it's an open character, push it onto the stack. // if it's a close character, find the matching open on the // stack, and use that script code. Any non-matching open - // characters above it on the stack will be poped. + // characters above it on the stack will be popped. if (pairIndex >= 0) { if ((pairIndex & 1) == 0) { ++parenSP; diff --git a/scribus/ui/actionsearchdialog.cpp b/scribus/ui/actionsearchdialog.cpp index 93b5ad1dc..c5b9c1423 100644 --- a/scribus/ui/actionsearchdialog.cpp +++ b/scribus/ui/actionsearchdialog.cpp @@ -99,7 +99,7 @@ void ActionSearchDialog::moveSelectionDown() /** * Fill the list with all actions that match the filter. - * If the filter contains multiple words, acceppts all actions that + * If the filter contains multiple words, accepts all actions that * contain all the words */ void ActionSearchDialog::updateList() diff --git a/scribus/ui/helpbrowser.h b/scribus/ui/helpbrowser.h index 51765d138..c457d5463 100644 --- a/scribus/ui/helpbrowser.h +++ b/scribus/ui/helpbrowser.h @@ -67,7 +67,7 @@ class SCRIBUS_API HelpBrowser : public QMainWindow, Ui::HelpBrowser Q_OBJECT public: - HelpBrowser(QWidget* parent, const QString& caption, const QString& guiLangage="en", const QString& jumpToSection="", const QString& jumpToFile=""); + HelpBrowser(QWidget* parent, const QString& caption, const QString& guiLanguage="en", const QString& jumpToSection="", const QString& jumpToFile=""); ~HelpBrowser(); void changeEvent(QEvent *e) override; diff --git a/scribus/ui/hruler.cpp b/scribus/ui/hruler.cpp index 303d94692..bc78fddf7 100644 --- a/scribus/ui/hruler.cpp +++ b/scribus/ui/hruler.cpp @@ -541,7 +541,7 @@ void Hruler::paintEvent(QPaintEvent *e) drawTextMarks(pos, endPos, p); - // start braket + // start bracket p.setPen(QPen(marginColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin)); int xPos = textPosToLocal(pos); p.drawLine(xPos, 0, xPos, bottomline); @@ -629,7 +629,7 @@ void Hruler::paintEvent(QPaintEvent *e) } } - // end braket + // end bracket p.setPen(QPen(marginColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin)); xPos = textPosToLocal(endPos); p.drawLine(xPos, 0, xPos, bottomline - 1); diff --git a/scribus/ui/inspage.cpp b/scribus/ui/inspage.cpp index 6c005b42d..244fc9706 100644 --- a/scribus/ui/inspage.cpp +++ b/scribus/ui/inspage.cpp @@ -227,7 +227,7 @@ InsPage::InsPage( QWidget* parent, ScribusDoc* currentDoc, int currentPage, int QScopedPointer<PageSize> ps(new PageSize(m_doc->pageSize())); - // try to find coresponding page size by dimensions + // try to find corresponding page size by dimensions if (ps->name() == CommonStrings::customPageSize) { PageSizeInfoMap pages = ps->sizesByDimensions(QSize(m_doc->pageWidth(), m_doc->pageHeight())); diff --git a/scribus/ui/linemarkerselector.cpp b/scribus/ui/linemarkerselector.cpp index a7a4a76dc..f0791531a 100644 --- a/scribus/ui/linemarkerselector.cpp +++ b/scribus/ui/linemarkerselector.cpp @@ -34,7 +34,7 @@ LineMarkerSelector::LineMarkerSelector(QWidget *parent) : void LineMarkerSelector::rebuildList(const QList<ArrowDesc> *arrowStyles) { - // ArrowStyles definied in: void PrefsManager::initArrowStyles() + // ArrowStyles defined in: void PrefsManager::initArrowStyles() int index = marker() == -1 ? 0 : marker(); listMarker->clear(); diff --git a/scribus/ui/multiprogressdialog.h b/scribus/ui/multiprogressdialog.h index fc840c6f8..caf35c7bb 100644 --- a/scribus/ui/multiprogressdialog.h +++ b/scribus/ui/multiprogressdialog.h @@ -113,7 +113,7 @@ class SCRIBUS_API MultiProgressDialog : public QDialog, Ui::MultiProgressDialog */ bool setProgress(const QString& barName, int progress); /** - * Set the prgress and total steps for a user defined progress bar + * Set the progress and total steps for a user defined progress bar * @param barName * @param progress * @param totalSteps diff --git a/scribus/ui/pagepropertiesdialog.cpp b/scribus/ui/pagepropertiesdialog.cpp index 6746d3210..5241ce47b 100644 --- a/scribus/ui/pagepropertiesdialog.cpp +++ b/scribus/ui/pagepropertiesdialog.cpp @@ -40,7 +40,7 @@ PagePropertiesDialog::PagePropertiesDialog( QWidget* parent, ScribusDoc* doc ) PageSize ps(doc->currentPage()->size()); - // try to find coresponding page size by dimensions + // try to find corresponding page size by dimensions if (ps.name() == CommonStrings::customPageSize) { PageSizeInfoMap pages = ps.sizesByDimensions(QSize(doc->currentPage()->width(), doc->currentPage()->height())); diff --git a/scribus/ui/prefs_indexes.cpp b/scribus/ui/prefs_indexes.cpp index fe1632097..5aac0d7dc 100644 --- a/scribus/ui/prefs_indexes.cpp +++ b/scribus/ui/prefs_indexes.cpp @@ -187,7 +187,7 @@ void Prefs_Indexes::updateStyleComboBoxes() styleLevel1ComboBox->addItems(stylesList); styleLevel2ComboBox->addItems(stylesList); styleLevel3ComboBox->addItems(stylesList); - //TODO: Indexing doesn't support multiple styles for differnet layers yet + //TODO: Indexing doesn't support multiple styles for different layers yet styleLevel2Label->setVisible(false); styleLevel3Label->setVisible(false); styleLevel2ComboBox->setVisible(false); diff --git a/scribus/ui/shortcutwidget.cpp b/scribus/ui/shortcutwidget.cpp index aeecd4965..ccd0985fb 100644 --- a/scribus/ui/shortcutwidget.cpp +++ b/scribus/ui/shortcutwidget.cpp @@ -46,7 +46,7 @@ void ShortcutWidget::languageChange() { noKey->setToolTip( tr("No shortcut for the style")); // set no shortcut for this style userDef->setToolTip( tr("Style has user defined shortcut")); // not sure what this thing does - setKeyButton->setToolTip( tr("Assign a shortcut for the style")); // activate shorcut assigning + setKeyButton->setToolTip( tr("Assign a shortcut for the style")); // activate shortcut assigning } bool ShortcutWidget::event( QEvent* ev ) diff --git a/scribus/ui/stylemanager.cpp b/scribus/ui/stylemanager.cpp index 277eb2e9d..ca6461bca 100644 --- a/scribus/ui/stylemanager.cpp +++ b/scribus/ui/stylemanager.cpp @@ -207,7 +207,7 @@ void StyleManager::editStyleByName(int rcType, const QString &name) // nitramr: // We need a better way to find rcType than by ID of top level items. If the order of the root style changes it will break. - // It is better to store an unchangable identifier in StyleViewItem::data(int column, int role). + // It is better to store an unchangeable identifier in StyleViewItem::data(int column, int role). // https://doc.qt.io/qt-6/qtreewidgetitem.html#data QTreeWidgetItemIterator it(styleView); @@ -682,7 +682,7 @@ void StyleManager::slotScrap() void StyleManager::slotNew() { -//#5334: Don't open into edit mdoe until user has selected a style type +//#5334: Don't open into edit mode until user has selected a style type // if (!m_isEditMode) // slotOk(); // switch to edit mode for a new style diff --git a/scribus/undomanager.h b/scribus/undomanager.h index e6faa5b92..68854af9b 100644 --- a/scribus/undomanager.h +++ b/scribus/undomanager.h @@ -152,7 +152,7 @@ public: UndoTransaction beginTransaction(const TransactionSettings& settings); /** - * @brief Cancels the current transaction and deletes groupped <code>UndoState</code>s. + * @brief Cancels the current transaction and deletes grouped <code>UndoState</code>s. * @brief Nothing from canceled transaction will be sent to the undo gui widgets. */ //void cancelTransaction(); diff --git a/scribus/util_math.h b/scribus/util_math.h index aea64ec9a..19adf0f39 100644 --- a/scribus/util_math.h +++ b/scribus/util_math.h @@ -54,7 +54,7 @@ inline double SCRIBUS_API manhattanDistance(const QPointF& p1, const QPointF& p2 /*! \brief Constrains an angle of rotation to 45 degree intervals Will make code simpler and reduce interval or provide as a parameter \param angle angle Angle in degrees - \param constrain contrain value in degrees + \param constrain constrain value in degrees \retval double Constrained angle */ double SCRIBUS_API constrainAngle(double angle, double constrain); diff --git a/scribus/vgradient.h b/scribus/vgradient.h index 02637b386..de295354d 100644 --- a/scribus/vgradient.h +++ b/scribus/vgradient.h @@ -167,7 +167,7 @@ public: GradientList& operator= (const GradientList& list); - /** \brief Get the document the list is related , return in cpp due to scribusdoc class delcaration */ + /** \brief Get the document the list is related , return in cpp due to scribusdoc class declaration */ ScribusDoc* document() const; /** \brief Assign the doc to which the list belong to.*/ -- 2.47.1 |