From 11f72a8d86ac9a9fb9b479afc49e5753b4a87631 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 7 Oct 2023 01:44:33 +0300 Subject: [PATCH 1/3] docs(readme): Update Arch Linux notes since they default to LuaJIT now --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9b4be6b1c..17db398e9 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,8 @@ Arch Linux has a prebuilt [SILE package][arch-sile] in the official package repo $ pacman -S sile ``` -The official package uses Lua 5.4. -Alternatively, a package that uses LuaJIT may be built manually from the [Arch User Repository][aur] using [sile-luajit][aur-sile-luajit]. -A VCS package is also available as [sile-git][aur-sile-git] to build from the latest Git commit. +The official package uses LuaJIT. +If you install LuaRocks for use with SILE via `pacman`, use the `lua51-*` variants to match LuaJIT. #### Fedora @@ -197,7 +196,7 @@ If you try to `brew link` and you get a series of messages including something l export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" Optionally you may install the Lua libraries listed in the [rockspec][] to your system (using either your system's package manager or [luarocks][] (`luarocks install --only-deps sile-dev-1.rockspec`). -By default all the required Lua libraries will be downloaded and bundled alongside the SILE the instalation. +By default all the required Lua libraries will be downloaded and bundled alongside the SILE the installation. If you downloaded a source tarball these dependencies are included, if you are using a git clone of the source repository the build system will require `luarocks` to fetch them during build. Note that OpenSSL development headers will be required for one of the Lua modules to compile¹. If your system has all the required packages already you may add `--with-system-luarocks` to the `./configure` command to avoid bundling them. @@ -351,8 +350,6 @@ SILE is distributed under the [MIT licence][license]. [libtexpdf]: https://github.com/sile-typesetter/libtexpdf [arch-sile]: https://archlinux.org/packages/community/x86_64/sile/ [aur]: https://wiki.archlinux.org/index.php/Arch_User_Repository - [aur-sile-luajit]: https://aur.archlinux.org/packages/sile-luajit/ - [aur-sile-git]: https://aur.archlinux.org/packages/sile-git/ [typesetting]: https://en.wikipedia.org/wiki/Typesetting [tex]: https://en.wikipedia.org/wiki/TeX [indesign]: https://en.wikipedia.org/wiki/Adobe_InDesign From e9cfc49fdc902f8f380e58e3f57ff3ec2de75d21 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 10 Oct 2023 01:22:44 +0300 Subject: [PATCH 2/3] docs(manual): Fix spelling mistakes --- documentation/c02-gettingstarted.sil | 2 +- documentation/c03-input.sil | 2 +- documentation/c05-packages.sil | 2 +- documentation/c06-macroscommands.sil | 2 +- documentation/c08-language.sil | 6 +++--- documentation/c10-classdesign.sil | 2 +- documentation/c11-inputoutput.sil | 8 ++++---- documentation/c12-xmlproc.sil | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/documentation/c02-gettingstarted.sil b/documentation/c02-gettingstarted.sil index e1a210fe6..255c7d436 100644 --- a/documentation/c02-gettingstarted.sil +++ b/documentation/c02-gettingstarted.sil @@ -256,7 +256,7 @@ This can be done with: Now the \code{sile} command will be available from any directory. \begin{autodoc:note} -If you wish you, can skip the install step and use the compiled SILE executable diretly from the source directory. +If you wish you, can skip the install step and use the compiled SILE executable directly from the source directory. As configured above, this will only work from a shell with the CWD set to the SILE source. To make it usable from anywhere, you can configure it with the source directory baked in as the installation location. diff --git a/documentation/c03-input.sil b/documentation/c03-input.sil index 051635cb4..f41a7cbc5 100644 --- a/documentation/c03-input.sil +++ b/documentation/c03-input.sil @@ -8,7 +8,7 @@ It is even less true now that 3rd party plugins can add their own input formats. Hence this chanpter has been renamed. The original chapter title was "SILE’s Input Language", as if there was only one. -The truth is there \em{is} an input syntax we call "SIL", but even that is perhaps best thought of as a structured data systax rather than a unique language. +The truth is there \em{is} an input syntax we call "SIL", but even that is perhaps best thought of as a structured data syntax rather than a unique language. The input strings \code{\\em\{foo\}} in SIL input syntax is 100\% equivalent to \code{foo} in XML input syntax. The SIL input syntax is provided as an easier to type alternative than XML which can be a bit verbose and tedious to work with by hand. On the other hand if you're handling data written by some other program, XML might be a much better solution. diff --git a/documentation/c05-packages.sil b/documentation/c05-packages.sil index 7862ae39c..b3f6089a4 100644 --- a/documentation/c05-packages.sil +++ b/documentation/c05-packages.sil @@ -98,7 +98,7 @@ As well as processing text, SILE can also include images. \section{Text & Characters} -This section covers a range of diffent topics from initial capitals to text transforms, through URL formatting. +This section covers a range of different topics from initial capitals to text transforms, through URL formatting. \subsection{dropcaps} \status:high diff --git a/documentation/c06-macroscommands.sil b/documentation/c06-macroscommands.sil index 7b1840612..4cab133df 100644 --- a/documentation/c06-macroscommands.sil +++ b/documentation/c06-macroscommands.sil @@ -17,7 +17,7 @@ that you need to keep entering again and again. \define[command=SILE]{\font[family=Gentium Plus]{% Book Basic has no +smcp, but readers don't need to know, since we're only using Book Basic as a holdover from old SILE which did. S\lower[height=0.5ex]{I}L\kern[width=-.2em]\raise[height=0.6ex]{\font[features=+smcp]{e}}}} For instance, let’s suppose that we want to design a nice little -“bumpy road” logo for SILE. (Afficionados of T\kern[width=-.1667em]\lower[height=0.5ex]{E}\kern[width=-.125em]X and friends will be familiar with the concept of +“bumpy road” logo for SILE. (Aficionados of T\kern[width=-.1667em]\lower[height=0.5ex]{E}\kern[width=-.125em]X and friends will be familiar with the concept of bumpy road logos.) Our logo will look like this: \SILE. It’s not a great logo, but we’ll use it as \SILE’s logo for the purposes of this section. diff --git a/documentation/c08-language.sil b/documentation/c08-language.sil index 4a13de249..bf42557d0 100644 --- a/documentation/c08-language.sil +++ b/documentation/c08-language.sil @@ -25,7 +25,7 @@ Language support may include: \item{frame advance and writing direction} \item{spacing} \item{choice of glyphs within a font} -\item{localization of programatically inserted strings} +\item{localization of programmatically inserted strings} \end{itemize} For example, Sindhi and Urdu users will expect the Arabic letter \em{heh} (\font[family=LateefGR]{ه}) to combine with other letters in different ways to standard Arabic shaping. @@ -95,7 +95,7 @@ To implement hyphenation for a new language, first check to see if TeX hyphenati \section{Localization} -A small handful of strings may be programatically added to documents depending on language, context, and options. +A small handful of strings may be programmatically added to documents depending on language, context, and options. For example by default in English the \autodoc:class{book} class will prepend “Chapter ” before chapter numbers output by the \autodoc:command{\chapter} command. These localized strings are managed internally using the Fluent localization system.% \footnote{See Project Fluent (\url{https://projectfluent.org}) for details on the data format and uses.} @@ -180,7 +180,7 @@ SILE aims to conform with the W3G document “Requirements for Japanese Text Lay Breaking rules \em{(kinzoku shori)} and intercharacter spacing is fully supported on selecting the Japanese language. The easiest way to set up the other elements of Japanese typesetting such as the \em{hanmen} grid and optional vertical typesetting support is by using the \autodoc:class{jplain} or \autodoc:class{jbook} classes. For other languages with similar layout requirements, more generic \autodoc:class{tplain} and \autodoc:class{tbook} classes are available that setup the layout elements without also setting the default language and font to Japanese specific values. -These are also good condidates to use as base classes and extend for more language-specific classes. +These are also good candidates to use as base classes and extend for more language-specific classes. \package-documentation{hanmenkyoshi} diff --git a/documentation/c10-classdesign.sil b/documentation/c10-classdesign.sil index e869a8be4..2a45581c0 100644 --- a/documentation/c10-classdesign.sil +++ b/documentation/c10-classdesign.sil @@ -169,7 +169,7 @@ end \subsection{Defining raw handlers} -“Raw handlers” allow packages to register new handlers (or callbacks) for use with the \autodoc:environment{raw} environment, which content is read as-is by SILE, without being interpretated. +“Raw handlers” allow packages to register new handlers (or callbacks) for use with the \autodoc:environment{raw} environment, which content is read as-is by SILE, without being interpreted. This is intended for advanced use cases where you may want to provide a way for users to embed arbitrary content (likely in another syntax), and you will provide the complete parsing and handling for it.\footnote{% This may be used to implement a “clever” verbatim environment. It is also used, for instance, by the \strong{markdown.sile} 3rd-party collection to embed Markdown or Djot content directly in a (SIL or XML) document.} diff --git a/documentation/c11-inputoutput.sil b/documentation/c11-inputoutput.sil index 153f26c2a..40bff9cf8 100644 --- a/documentation/c11-inputoutput.sil +++ b/documentation/c11-inputoutput.sil @@ -75,7 +75,7 @@ We must code up a few real functions now. \subsection{Content appropriation} What we first need is to tell SILE how to choose our inputter when it is given a file in our input format. -The \code{appropriate()} method of our inputter is reponsible for providing the corresponding logic. +The \code{appropriate()} method of our inputter is responsible for providing the corresponding logic. It is a static method (so it does not have a \code{self} argument), and it takes up to three arguments: \begin{itemize} \item{the round, an integer between 1 and 3.} @@ -87,10 +87,10 @@ It is expected to return a boolean value, \code{true} if this handler is appropr Earlier, we said that inputters were checked in their priority order. This was not fully complete. Let’s add another piece to our puzzle: Inputters are actually checked orderly indeed, but three times. -This allows for quick compatiblitity checks to supercede resource-intensive ones. +This allows for quick compatiblitity checks to supersede resource-intensive ones. \begin{itemize} \item{Round 1 expects the file name to be checked: for instance, we could base our decision on recognized file extensions.} -\item{Round 2 expects some portion of the content string to be checked: for instance, we could base our decision on sniffing for some sequence of characters expected to occurr early in the document (or any other content inspection strategy).} +\item{Round 2 expects some portion of the content string to be checked: for instance, we could base our decision on sniffing for some sequence of characters expected to occur early in the document (or any other content inspection strategy).} \item{Round 3 expects the entire content to be successfully parsed.} \end{itemize} @@ -178,7 +178,7 @@ In particular, options passed to the \autodoc:command{\include} commands are pas Outputters usually live somewhere in the \code{outputters/} subdirectory of either where your first input file is located, your current working directory, or your SILE path. -All ouput handlers inherit from a \autodoc:package{base} outputter. +All output handlers inherit from a \autodoc:package{base} outputter. It is an abstract class, providing just one concrete method, and defining a bunch of methods that any actual outputter has to override for the specifics of its target format. We first need to declare the name of our new outputter, as well as the default file extension for the output file, which will be appended to the base name of the main input file if the user does not provide an explicit output file name on their command line. diff --git a/documentation/c12-xmlproc.sil b/documentation/c12-xmlproc.sil index 25b69c039..4fc557dc3 100644 --- a/documentation/c12-xmlproc.sil +++ b/documentation/c12-xmlproc.sil @@ -10,7 +10,7 @@ Since DocDook itself doesn’t specify anything about presentation such as paper When you use the \code{-c docbook} command line option to SILE, SILE will use the \autodoc:class{docbook} class in spite of any document declaration. In addition, options such as paper size could be set; for example, \code{-O papersize=legal}. -The class initalization for DocBoox isn’t too fancy; it just loads up a couple packages that will get used later. +The class initialization for DocBoox isn’t too fancy; it just loads up a couple packages that will get used later. \begin{autodoc:note} Much of the example code in this chapter is in SIL format using macros. From ab665cc9af775a2212da3f9777b02d44d0d1b4eb Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 10 Oct 2023 01:19:47 +0300 Subject: [PATCH 3/3] chore(core): Fix spelling mistakes throughout code base --- classes/docbook.lua | 2 +- classes/plain.lua | 2 +- classes/tplain.lua | 2 +- core/break.lua | 4 ++-- core/nodefactory.lua | 2 +- core/sile.lua | 6 +++--- core/utilities-numbers.lua | 2 +- core/utilities.lua | 2 +- inputters/base.lua | 2 +- outputters/debug.lua | 2 +- outputters/libtexpdf.lua | 2 +- packages/autodoc/init.lua | 2 +- packages/leaders/init.lua | 2 +- packages/lists/init.lua | 2 +- packages/math/base-elements.lua | 14 +++++++------- packages/ruby/init.lua | 2 +- packages/simpletable/init.lua | 2 +- src/justenoughicu.c | 2 +- tests/vertical.sil | 2 +- typesetters/base.lua | 4 ++-- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/classes/docbook.lua b/classes/docbook.lua index 93c429189..4c967f5f8 100644 --- a/classes/docbook.lua +++ b/classes/docbook.lua @@ -21,7 +21,7 @@ function class:_init (options) self:loadPackage("footnotes") -- SILE sensibly does not define a pixels unit because it has no meaning in its frame of reference. However the -- Docbook standard requires them and even defaults to them for bare numbers, even while warning against their use. - -- Here we define a px arbitrarily to be the equivilent point unit if output was 300 DPI. + -- Here we define a px arbitrarily to be the equivalent point unit if output was 300 DPI. SILE.units.px = { definition = "0.24pt" } diff --git a/classes/plain.lua b/classes/plain.lua index 876f2abe0..12ef08f95 100644 --- a/classes/plain.lua +++ b/classes/plain.lua @@ -76,7 +76,7 @@ function class:registerCommands () self:registerCommand("noindent", function (_, content) if #SILE.typesetter.state.nodes ~= 0 then - SU.warn("\\noindent called after nodes already recieved in a paragraph, the setting will have no effect because the parindent (if any) has already been output") + SU.warn("\\noindent called after nodes already received in a paragraph, the setting will have no effect because the parindent (if any) has already been output") end SILE.settings:set("current.parindent", SILE.nodefactory.glue()) SILE.process(content) diff --git a/classes/tplain.lua b/classes/tplain.lua index c43a1f7a8..f1c6ec189 100644 --- a/classes/tplain.lua +++ b/classes/tplain.lua @@ -14,7 +14,7 @@ class.defaultFrameset.content = { } -- The classes tplain and tbook inherit from plain and book respectively but also --- have this bit in common; this makes it accessable +-- have this bit in common; this makes it accessible function class:_t_common () self:loadPackage("font-fallback") self:loadPackage("hanmenkyoshi") diff --git a/core/break.lua b/core/break.lua index 3a18cf692..1f041885a 100644 --- a/core/break.lua +++ b/core/break.lua @@ -91,7 +91,7 @@ end -- up to the that total. Returning values that don't add up may produce -- unexpected results. -- --- TeX wizards shall also note that this is slighty different from +-- TeX wizards shall also note that this is slightly different from -- Knuth's definition "nline l1 i1 l2 i2 ... lN iN". function lineBreak:parShape(_) return 0, self.hsize, 0 @@ -176,7 +176,7 @@ function lineBreak:tryBreak() -- 855 end -- 861 if self.r.lineNumber > self.old_l then - if debugging then SU.debug("break", "Mimimum demerits = " .. self.minimumDemerits) end + if debugging then SU.debug("break", "Minimum demerits = " .. self.minimumDemerits) end if self.minimumDemerits < awful_bad and (self.old_l ~= self.easy_line or self.r == self.activeListHead) then self:createNewActiveNodes(breakType) end diff --git a/core/nodefactory.lua b/core/nodefactory.lua index dd3511336..9d986e007 100644 --- a/core/nodefactory.lua +++ b/core/nodefactory.lua @@ -255,7 +255,7 @@ end getmetatable(nodefactory.unshaped).__index = function (_, _) -- if k == "width" then SU.error("Can't get width of unshaped node", true) end -- TODO: No idea why porting to proper Penlight classes this ^^^^^^ started - -- killing everything. Perhaps becaus this function started working and would + -- killing everything. Perhaps because this function started working and would -- actually need to return rawget(self, k) or something? end diff --git a/core/sile.lua b/core/sile.lua index 3d8db58a5..9579c6122 100644 --- a/core/sile.lua +++ b/core/sile.lua @@ -59,8 +59,8 @@ SILE.documentState = {} SILE.rawHandlers = {} -- User input values, currently from CLI options, potentially all the inuts --- needed for a user to use a SILE-as-a-library verion to produce documents --- programatically. +-- needed for a user to use a SILE-as-a-library version to produce documents +-- programmatically. SILE.input = { filenames = {}, evaluates = {}, @@ -97,7 +97,7 @@ SILE.nodefactory = require("core.nodefactory") -- NOTE: -- See remainaing internal libraries loaded at the end of this file because --- they run core SILE functions on load istead of waiting to be called (or +-- they run core SILE functions on load instead of waiting to be called (or -- depend on others that do). local function runEvals (evals, arg) diff --git a/core/utilities-numbers.lua b/core/utilities-numbers.lua index 8666edc4a..4eef0ea43 100644 --- a/core/utilities-numbers.lua +++ b/core/utilities-numbers.lua @@ -60,7 +60,7 @@ local icuFormat = function (num, lang, options) -- ICU locale: see https://unicode-org.github.io/icu/userguide/locale/ -- Ex. "en", "en-US", "sr-Latn"... local iculocale = lang or "" - -- ICU keywork for a numbering system specifier: @numbers=xxxx + -- ICU keyword for a numbering system specifier: @numbers=xxxx -- The specifiers are defined here: -- https://github.com/unicode-org/cldr/blob/main/common/bcp47/number.xml if options.system then diff --git a/core/utilities.lua b/core/utilities.lua index d83bde2b2..05bef5ad3 100644 --- a/core/utilities.lua +++ b/core/utilities.lua @@ -101,7 +101,7 @@ utilities.deprecated = function (old, new, warnat, errorat, extra) -- runtime but not useful if we encounter deprecated code in core code. Users -- will never encounter this failure, but as a developer it’s hard to test a -- deprecation when core code refactoring is an all-or-nothing proposition. - -- Hence we fake it ‘till we make it, all deprecations internally are warings. + -- Hence we fake it ‘till we make it, all deprecations internally are warnings. local brackets = old:sub(1,1) == '\\' and "" or "()" local _new = new and "Please use " .. (new .. brackets) .. " instead." or "Plase don't use it." local msg = (old .. brackets) .. " was deprecated in SILE v" .. tostring(warnat) .. ". " .. _new .. (extra and "\n" .. extra .. "\n\n" or "") diff --git a/inputters/base.lua b/inputters/base.lua index 7a1d74eb6..a00c67673 100644 --- a/inputters/base.lua +++ b/inputters/base.lua @@ -23,7 +23,7 @@ function inputter:classInit (options) class = constructor._name end class = SILE.input.class or class or options.class or "plain" - options.class = nil -- don't pass already consumed class option to contstructor + options.class = nil -- don't pass already consumed class option to constructor constructor = self._docclass or constructor or SILE.require(class, "classes", true) if constructor.id then SU.deprecated("std.object", "pl.class", "0.13.0", "0.14.0", string.format(_deprecated, constructor.id)) diff --git a/outputters/debug.lua b/outputters/debug.lua index acc296e16..9cfe3e3bd 100644 --- a/outputters/debug.lua +++ b/outputters/debug.lua @@ -15,7 +15,7 @@ local function _round (input) -- just enough to fix the bias so our test suite works across interpreters. -- Note that even a true rounding function here will fail because the bias is -- inherent to the floating point type. Also note we are erroring in favor of - -- the *less* common option beacuse the LuaJIT VMS are hopelessly broken + -- the *less* common option because the LuaJIT VMS are hopelessly broken -- whereas normal LUA VMs can be cooerced. if input > 0 then input = input + .00000000000001 end if input < 0 then input = input - .00000000000001 end diff --git a/outputters/libtexpdf.lua b/outputters/libtexpdf.lua index 80f2e37de..9e6ab8e03 100644 --- a/outputters/libtexpdf.lua +++ b/outputters/libtexpdf.lua @@ -42,7 +42,7 @@ function outputter:newPage () pdf.beginpage() end --- pdf stucture package needs a tie in here +-- pdf structure package needs a tie in here function outputter._endHook (_) end diff --git a/packages/autodoc/init.lua b/packages/autodoc/init.lua index fb8ba28d2..167bba5f2 100644 --- a/packages/autodoc/init.lua +++ b/packages/autodoc/init.lua @@ -356,7 +356,7 @@ function package:registerCommands () SILE.call("novbreak") SILE.call("fullrule", { thickness = "0.5pt" }) SILE.call("novbreak") - end, "Ouputs a line used for surrounding code blocks (somewhat internal)") + end, "Outputs a line used for surrounding code blocks (somewhat internal)") self:registerCommand("autodoc:example", function(_, content) -- Loosely derived from the \examplefont command from the original SILE manual... diff --git a/packages/leaders/init.lua b/packages/leaders/init.lua index 9f41d6630..7fe989982 100644 --- a/packages/leaders/init.lua +++ b/packages/leaders/init.lua @@ -75,7 +75,7 @@ function leader:outputYourself (typesetter, line) end end -- Return to our start (saved) position and move to the full leaders width. - -- (So we are sure to safely get the correct width, whathever we did above + -- (So we are sure to safely get the correct width, whatever we did above -- with the remainder space and the leader repetitions). typesetter.frame.state.cursorX = ox typesetter.frame.state.cursorY = oy diff --git a/packages/lists/init.lua b/packages/lists/init.lua index a7c862bf0..b2082af0f 100644 --- a/packages/lists/init.lua +++ b/packages/lists/init.lua @@ -102,7 +102,7 @@ function package:doItem (options, content) local stepback if enumStyle.display then - -- The positionning is quite tentative... LaTeX would right justify the + -- The positioning is quite tentative... LaTeX would right justify the -- number (at least for roman numerals), i.e. -- i. Text -- ii. Text diff --git a/packages/math/base-elements.lua b/packages/math/base-elements.lua index 7736a1d49..f8332ec8a 100644 --- a/packages/math/base-elements.lua +++ b/packages/math/base-elements.lua @@ -225,7 +225,7 @@ end -- Typesetting of mbox evolves four steps: -- 1. Determine the mode for each mbox according to their parent. -- 2. Shape the mbox hierarchy from leaf to top. Get the shape and relative position. --- 3. Convert mbox into _nnode's to put in SILE's typesetting framwork +-- 3. Convert mbox into _nnode's to put in SILE's typesetting framework elements.mbox = pl.class(nodefactory.hbox) elements.mbox._type = "Mbox" @@ -254,15 +254,15 @@ function elements.mbox:_init () end function elements.mbox.styleChildren (_) - SU.error("styleChildren is a virtual function that need to be overriden by its child classes") + SU.error("styleChildren is a virtual function that need to be overridden by its child classes") end function elements.mbox.shape (_, _, _) - SU.error("shape is a virtual function that need to be overriden by its child classes") + SU.error("shape is a virtual function that need to be overridden by its child classes") end function elements.mbox.output (_, _, _, _) - SU.error("output is a virtual function that need to be overriden by its child classes") + SU.error("output is a virtual function that need to be overridden by its child classes") end function elements.mbox:getMathMetrics () @@ -860,7 +860,7 @@ function elements.text:shape () .vertGlyphConstructions[glyphs[1].gid] if constructions then local displayVariants = constructions.mathGlyphVariantRecord - -- We select the biggest variant. TODO: we shoud probably select the + -- We select the biggest variant. TODO: we should probably select the -- first variant that is higher than displayOperatorMinHeight. local biggest local m = 0 @@ -945,7 +945,7 @@ function elements.text:stretchyReshape (depth, height) local closest local closestI local m = requiredAdvance - (self.depth+self.height):tonumber() * upem/sz - SU.debug("math", "strech: m =", m) + SU.debug("math", "stretch: m =", m) for i,v in ipairs(variants) do local diff = math.abs(v.advanceMeasurement - requiredAdvance) SU.debug("math", "stretch: diff =", diff) @@ -1105,7 +1105,7 @@ function elements.mtr.shape (_) end -- done by parent table function elements.mtr.output (_) end elements.table = pl.class(elements.mbox) -elements.table._type = "table" -- TODO why case diference? +elements.table._type = "table" -- TODO why case difference? function elements.table:_init (children, options) elements.mbox._init(self) diff --git a/packages/ruby/init.lua b/packages/ruby/init.lua index ec8af8edf..0da12ec66 100644 --- a/packages/ruby/init.lua +++ b/packages/ruby/init.lua @@ -29,7 +29,7 @@ end function package:_init () base._init(self) - -- Japaneese language support defines units which are useful here + -- Japanese language support defines units which are useful here self:loadPackage("font-fallback") SILE.call("font:add-fallback", { family = "Noto Sans CJK JP" }) SILE.languageSupport.loadLanguage("ja") diff --git a/packages/simpletable/init.lua b/packages/simpletable/init.lua index b5d4ba577..f762ca7ac 100644 --- a/packages/simpletable/init.lua +++ b/packages/simpletable/init.lua @@ -24,7 +24,7 @@ function package:_init (options) trTag = SU.required(options, "trTag", "setting up table class") tdTag = SU.required(options, "tdTag", "setting up table class") - -- This is a post init calback instead of the usual early command registration + -- This is a post init callback instead of the usual early command registration -- method using our package loader because we don't know what commands to register -- until we've been instantiated. self.class:registerPostinit(function (_) diff --git a/src/justenoughicu.c b/src/justenoughicu.c index f2089af21..b5da54190 100644 --- a/src/justenoughicu.c +++ b/src/justenoughicu.c @@ -311,7 +311,7 @@ int icu_collation_create(lua_State *L) { int numericOrdering = UCOL_ON; // N.B. default is UCOL_OFF int backwards = UCOL_OFF; // So-called 'french collation', default is UCOL_OFF // NOT IMPLEMENTED: maxVariable punct / maxVariable space - // This affects 'alternate handling' with espect to spaces and/or punctuations + // This affects 'alternate handling' with expect to spaces and/or punctuations // I never used it and I'm lazy - assume default is ok... int caseFirst = UCOL_OFF; // n.B. default is UCOL_OFF int caseLevel = UCOL_OFF; // n.B. default is UCOL_OFF diff --git a/tests/vertical.sil b/tests/vertical.sil index ffc210aa0..3c9fcf787 100644 --- a/tests/vertical.sil +++ b/tests/vertical.sil @@ -1,7 +1,7 @@ \begin[class=jplain,layout=tate]{document} \nofolios % Note: differences between Noto font versions make adding more characters to -% this test brittle. For examle 日本は昔からruns into trouble when the height +% this test brittle. For example 日本は昔からruns into trouble when the height % of 昔 is different. If the tate layout mechanism is working, it’s going % to work at two characters, if a longer string fails, it’s likely some other % mechanism or value that actually changed. diff --git a/typesetters/base.lua b/typesetters/base.lua index 6c6584884..7b44b96cf 100644 --- a/typesetters/base.lua +++ b/typesetters/base.lua @@ -754,7 +754,7 @@ function typesetter:breakpointsToLines (breakpoints) end if linestart < #nodes then -- Abnormal, but warn so that one has a chance to check which bits - -- are misssing at output. + -- are missing at output. SU.warn("Internal typesetter error " .. (#nodes - linestart) .. " skipped nodes") end return lines @@ -779,7 +779,7 @@ function typesetter.computeLineRatio (_, breakwidth, slice) -- zero boxes, so as to reach actual content... if slice[n].value ~= "margin" then -- ... but any other glue than a margin, at the end of a line, is actually - -- extraneous. It will however also be accounted for below, so substract + -- extraneous. It will however also be accounted for below, so subtract -- them to cancel their width. Typically, if a line break occurred at -- a space, the latter is then at the end of the line now, and must be -- ignored.