Index: modules/doctools/checker.tcl ================================================================== --- modules/doctools/checker.tcl +++ modules/doctools/checker.tcl @@ -310,11 +310,11 @@ Go body fmt_description [Sectdef section Description description] } # Storage for (sub)section ids to enable checking for ambigous -# identificaton. The ids on this level are logical names. The backends +# identification. The ids on this level are logical names. The backends # are given physical names (via counters). global sect ; # Map of logical -> physical ids global sectt ; # Map of logical -> section title global sectci ; # Current section (id) global sectct ; # Current section (title) Index: modules/doctools/checker_toc.tcl ================================================================== --- modules/doctools/checker_toc.tcl +++ modules/doctools/checker_toc.tcl @@ -70,11 +70,11 @@ # --------------+-----------------------+---------------------- # contents | item | -> contents # division | | -> division # --------------+-----------------------+---------------------- # contents | division_start | -> end, PUSH division -# division | | -> divison, PUSH division +# division | | -> division, PUSH division # end | | PUSH division # --------------+-----------------------+---------------------- # division | division_end | POP (-> division / -> end) # --------------+-----------------------+---------------------- # contents | toc_end | -> done Index: modules/doctools/doctools.man ================================================================== --- modules/doctools/doctools.man +++ modules/doctools/doctools.man @@ -440,11 +440,11 @@ The value for this parameter has to be a list of triples specifying cross-reference information. This information is used by the engine to create more hyperlinks. Each triple is a list containing a pattern, symbolic filename and fragment reference, in this order. If a pattern -is specified multiple times the last occurence of the pattern will be +is specified multiple times the last occurrence of the pattern will be used. [para] The engine will consult the xref database when encountering specific Index: modules/doctools/mpformats/_text.tcl ================================================================== --- modules/doctools/mpformats/_text.tcl +++ modules/doctools/mpformats/_text.tcl @@ -76,11 +76,11 @@ global nextId ; set nextId 0 ; # Counter for environment generation. global currentId ; set currentId {} ; # Id of current environment in 'pEnv' global currentEnv ; array set currentEnv {} ; # Current environment, expanded form. global contexts ; set contexts [list] ; # Stack of saved environments. -global off ; set off 1 ; # Supression of plain text in some places. +global off ; set off 1 ; # Suppression of plain text in some places. ################################################################ # Management of the current context. proc Text {text} {global para ; append para $text ; return} Index: modules/doctools/mpformats/c.msg ================================================================== --- modules/doctools/mpformats/c.msg +++ modules/doctools/mpformats/c.msg @@ -30,11 +30,11 @@ mcset c depr_lstitem "Deprecated command \"%s\".\n\tPlease use \[def\] instead." mcset c depr_nl "Deprecated command \"%s\".\n\tPlease use \[para\] instead." mcset c depr_bullet "Deprecated command \"%s\".\n\tPlease use \[item\] instead." mcset c depr_ltype "Deprecated list type \"%s\".\n\tPlease use \"%s\" instead." mcset c sectambig "(Sub)Section title \"%s\" causes ambiguous section references." -mcset c missingsect "Refered (Sub)Section \"%s\" is not known." +mcset c missingsect "Referred (Sub)Section \"%s\" is not known." # TOC messages mcset c end/open/toc "\[toc_end\] missing." mcset c toc/plaintext "Plain text beyond whitespace is not allowed." Index: modules/doctools/mpformats/en.msg ================================================================== --- modules/doctools/mpformats/en.msg +++ modules/doctools/mpformats/en.msg @@ -30,11 +30,11 @@ mcset en depr_lstitem "Deprecated command \"%s\".\n\tPlease use \[def\] instead." mcset en depr_nl "Deprecated command \"%s\".\n\tPlease use \[para\] instead." mcset en depr_bullet "Deprecated command \"%s\".\n\tPlease use \[item\] instead." mcset en depr_ltype "Deprecated list type \"%s\".\n\tPlease use \"%s\" instead." mcset en sectambig "(Sub)Section title \"%s\" causes ambiguous section references." -mcset en missingsect "Refered (Sub)Section \"%s\" is not known." +mcset en missingsect "Referred (Sub)Section \"%s\" is not known." mcset en end/open/toc "\[toc_end\] missing." mcset en toc/plaintext "Plain text beyond whitespace is not allowed." mcset en toc/begincmd "Command not allowed here." mcset en toc/endcmd "Command not allowed here." Index: modules/doctools/mpformats/fmt.html ================================================================== --- modules/doctools/mpformats/fmt.html +++ modules/doctools/mpformats/fmt.html @@ -268,11 +268,11 @@ append result [tag/ ul] \n # Implicit sections coming after the TOC (Synopsis, then the # description which starts the actual document). The other - # implict sections are added at the end of the document and + # implicit sections are added at the end of the document and # are generated by 'fmt_manpage_end' in the second pass. if {$syn != {} || $req != {}} { append result [fmt_section Synopsis synopsis] [para_close] [taga div {class doctools_synopsis}] \n if {$req != {}} { Index: modules/doctools/mpformats/fmt.latex ================================================================== --- modules/doctools/mpformats/fmt.latex +++ modules/doctools/mpformats/fmt.latex @@ -337,11 +337,11 @@ proc fmt_uri {text {label {}}} { if {$label == {}} { # Without label we use the link directly as part of the text. return [Underline $text] } else { - # Label is used in the text, refered link is delegated into a + # Label is used in the text, referred link is delegated into a # footnote. return "[Underline $label] \1\\footnote\{[texEscape $text]\}" } } proc fmt_image {text {label {}}} { Index: modules/doctools2idx/export.tcl ================================================================== --- modules/doctools2idx/export.tcl +++ modules/doctools2idx/export.tcl @@ -1,10 +1,10 @@ -# docidx.tcl -- +# export.tcl -- # # Exporting indices into other formats. # -# Copyright (c) 2009 Andreas Kupries +# Copyright (c) 2009-2018 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: export.tcl,v 1.1 2009/04/01 04:28:37 andreas_kupries Exp $ @@ -65,11 +65,11 @@ set serial [doctools::idx::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) - lappend configuraton format [$plugin plugin] + lappend configuration format [$plugin plugin] return [$plugin do export $serial $configuration] } # ### ### ### ######### ######### ######### @@ -119,7 +119,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::idx::export 0.1 +package provide doctools::idx::export 0.2 return Index: modules/doctools2idx/idx_export.man ================================================================== --- modules/doctools2idx/idx_export.man +++ modules/doctools2idx/idx_export.man @@ -1,7 +1,8 @@ +[vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] -[manpage_begin doctools::idx::export n 0.1] +[manpage_begin doctools::idx::export n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] [keywords export] [keywords formatting] @@ -17,15 +18,15 @@ [keywords reference] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2018 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Exporting keyword indices}] [category {Documentation tools}] -[require doctools::idx::export [opt 0.1]] +[require doctools::idx::export [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::idx::structure] [require snit] [require pluginmgr] @@ -199,11 +200,11 @@ [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no -effect, these values will be internally overriden when invoking an +effect, these values will be internally overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified Index: modules/doctools2idx/idx_import.man ================================================================== --- modules/doctools2idx/idx_import.man +++ modules/doctools2idx/idx_import.man @@ -1,7 +1,8 @@ +[vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] -[manpage_begin doctools::idx::import n 0.1] +[manpage_begin doctools::idx::import n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] [keywords import] [keywords index] @@ -11,15 +12,15 @@ [keywords markup] [keywords parsing] [keywords plugin] [keywords reference] [keywords url] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2018 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] -[require doctools::idx::import [opt 0.1]] +[require doctools::idx::import [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::idx::structure] [require snit] [require pluginmgr] @@ -209,11 +210,11 @@ [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no -effect, these values will be internally overriden when invoking an +effect, these values will be internally overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified Index: modules/doctools2idx/idx_parse.man ================================================================== --- modules/doctools2idx/idx_parse.man +++ modules/doctools2idx/idx_parse.man @@ -133,11 +133,11 @@ Each error element will be a list containing six strings describing an error in detail. The strings will be [list_begin enumerated] [enum] -The path of the file the error occured in. This may be empty. +The path of the file the error occurred in. This may be empty. [enum] The range of the token the error was found at. This range is a two-element list containing the offset of the first and last character in the range, counted from the beginning of the input (file). Offsets Index: modules/doctools2idx/import.tcl ================================================================== --- modules/doctools2idx/import.tcl +++ modules/doctools2idx/import.tcl @@ -1,10 +1,10 @@ -# docidx.tcl -- +# import.tcl -- # # Importing indices into other formats. # -# Copyright (c) 2009 Andreas Kupries +# Copyright (c) 2009-2018 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: import.tcl,v 1.2 2011/11/17 08:00:45 andreas_kupries Exp $ @@ -68,11 +68,11 @@ method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) - lappend configuraton format [$plugin plugin] + lappend configuration format [$plugin plugin] return [$plugin do import $text $configuration] } method {import file} {path {format {}}} { @@ -185,7 +185,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::idx::import 0.1 +package provide doctools::idx::import 0.2 return Index: modules/doctools2idx/import_json.tcl ================================================================== --- modules/doctools2idx/import_json.tcl +++ modules/doctools2idx/import_json.tcl @@ -65,11 +65,11 @@ # Note: We cannot fail here on duplicate keys in the input, # especially for keywords and references, as we do for Tcl-based # canonical index serializations, because our underlying JSON # parser automatically merges them, by taking only the last found # definition. I.e. of two or more definitions for a key X the last - # overwrites all previous occurences. + # overwrites all previous occurrences. return [doctools::idx::structure canonicalize [json::json2dict $text]] } # ### ### ### ######### ######### ######### ## Ready Index: modules/doctools2idx/include/serialization.inc ================================================================== --- modules/doctools2idx/include/serialization.inc +++ modules/doctools2idx/include/serialization.inc @@ -63,14 +63,14 @@ The [term type] of a reference can be one of two values, [list_begin definitions][comment {-- types --}] [def [const manpage]] The identifier of the reference is interpreted as symbolic file name, -refering to one of the documents the index was made for. +referring to one of the documents the index was made for. [def [const url]] -The identifier of the reference is interpreted as an url, refering to +The identifier of the reference is interpreted as an url, referring to some external location, like a website, etc. [list_end][comment {-- types --}] [list_end][comment {-- regular points --}] Index: modules/doctools2idx/parse.tcl ================================================================== --- modules/doctools2idx/parse.tcl +++ modules/doctools2idx/parse.tcl @@ -12,11 +12,11 @@ # The order of the keywords under root, and of the references under # their keyword reflects the order of the information in the parsed # document. # Attributes in the nodes, except root provide location information, -# i.e. refering from there in the input the information is coming from +# i.e. referring from there in the input the information is coming from # (human-readable output: line/col for end of token, offset start/end # for range covered by token. # # ## ### ##### ######## ############# ##################### ## Requirements Index: modules/doctools2idx/pkgIndex.tcl ================================================================== --- modules/doctools2idx/pkgIndex.tcl +++ modules/doctools2idx/pkgIndex.tcl @@ -9,12 +9,12 @@ # - Parser for docidx markup, and handling serializations # - Message catalogs for the parser package ifneeded doctools::idx 2 [list source [file join $dir container.tcl]] -package ifneeded doctools::idx::export 0.1 [list source [file join $dir export.tcl]] -package ifneeded doctools::idx::import 0.1 [list source [file join $dir import.tcl]] +package ifneeded doctools::idx::export 0.2 [list source [file join $dir export.tcl]] +package ifneeded doctools::idx::import 0.2 [list source [file join $dir import.tcl]] package ifneeded doctools::idx::export::docidx 0.1 [list source [file join $dir export_docidx.tcl]] package ifneeded doctools::idx::export::html 0.2 [list source [file join $dir export_html.tcl]] package ifneeded doctools::idx::export::json 0.1 [list source [file join $dir export_json.tcl]] package ifneeded doctools::idx::export::nroff 0.3 [list source [file join $dir export_nroff.tcl]] Index: modules/doctools2toc/ChangeLog ================================================================== --- modules/doctools2toc/ChangeLog +++ modules/doctools2toc/ChangeLog @@ -40,11 +40,11 @@ * Released and tagged Tcllib 1.12 ======================== * 2009-11-14 Andreas Kupries - * container.test: Fixed up typos in comments refering to keyword + * container.test: Fixed up typos in comments referring to keyword * export.tcl: indices, while the packages are all about tables of * export_doctoc.tcl: contents. Unchanged functionality, version * export_doctoc.test: left unchanged. * export_html.tcl: * export_html.test: Index: modules/doctools2toc/export.tcl ================================================================== --- modules/doctools2toc/export.tcl +++ modules/doctools2toc/export.tcl @@ -1,10 +1,10 @@ -# doctoc.tcl -- +# export.tcl -- # # Exporting indices into other formats. # -# Copyright (c) 2009 Andreas Kupries +# Copyright (c) 2009-2018 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: export.tcl,v 1.2 2009/11/15 05:50:03 andreas_kupries Exp $ @@ -65,11 +65,11 @@ set serial [doctools::toc::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) - lappend configuraton format [$plugin plugin] + lappend configuration format [$plugin plugin] return [$plugin do export $serial $configuration] } # ### ### ### ######### ######### ######### @@ -119,7 +119,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::toc::export 0.1 +package provide doctools::toc::export 0.2 return Index: modules/doctools2toc/export_doctoc.tcl ================================================================== --- modules/doctools2toc/export_doctoc.tcl +++ modules/doctools2toc/export_doctoc.tcl @@ -8,11 +8,11 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: export_doctoc.tcl,v 1.3 2009/11/15 05:50:03 andreas_kupries Exp $ # This package is a plugin for the doctools::toc v2 system. It takes -# the list serialization of a table of contens and produces text in +# the list serialization of a table of contents and produces text in # doctoc format. # ### ### ### ######### ######### ######### ## Requisites Index: modules/doctools2toc/import.tcl ================================================================== --- modules/doctools2toc/import.tcl +++ modules/doctools2toc/import.tcl @@ -1,10 +1,10 @@ -# doctoc.tcl -- +# import.tcl -- # # Importing indices into other formats. # -# Copyright (c) 2009 Andreas Kupries +# Copyright (c) 2009-2018 Andreas Kupries # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: import.tcl,v 1.3 2011/11/17 08:00:45 andreas_kupries Exp $ @@ -68,11 +68,11 @@ method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) - lappend configuraton format [$plugin plugin] + lappend configuration format [$plugin plugin] return [$plugin do import $text $configuration] } method {import file} {path {format {}}} { @@ -185,7 +185,7 @@ } # ### ### ### ######### ######### ######### ## Ready -package provide doctools::toc::import 0.1 +package provide doctools::toc::import 0.2 return Index: modules/doctools2toc/import_json.tcl ================================================================== --- modules/doctools2toc/import_json.tcl +++ modules/doctools2toc/import_json.tcl @@ -64,11 +64,11 @@ # Note: We cannot fail here on duplicate keys in the input, # especially for keywords and references, as we do for Tcl-based # canonical toc serializations, because our underlying JSON parser # automatically merges them, by taking only the last found # definition. I.e. of two or more definitions for a key X the last - # overwrites all previous occurences. + # overwrites all previous occurrences. return [doctools::toc::structure canonicalize [json::json2dict $text]] } # ### ### ### ######### ######### ######### ## Ready Index: modules/doctools2toc/parse.tcl ================================================================== --- modules/doctools2toc/parse.tcl +++ modules/doctools2toc/parse.tcl @@ -11,11 +11,11 @@ # The order of the elements under root, and of the elements under # their division reflects the order of the information in the parsed # document. # Attributes in the nodes, except root provide location information, -# i.e. refering from there in the input the information is coming from +# i.e. referring from there in the input the information is coming from # (human-readable output: line/col for end of token, offset start/end # for range covered by token. # # ## ### ##### ######## ############# ##################### ## Requirements Index: modules/doctools2toc/pkgIndex.tcl ================================================================== --- modules/doctools2toc/pkgIndex.tcl +++ modules/doctools2toc/pkgIndex.tcl @@ -9,12 +9,12 @@ # - Parser for doctoc markup, and handling serializations # - Message catalogs for the parser package ifneeded doctools::toc 2 [list source [file join $dir container.tcl]] -package ifneeded doctools::toc::export 0.1 [list source [file join $dir export.tcl]] -package ifneeded doctools::toc::import 0.1 [list source [file join $dir import.tcl]] +package ifneeded doctools::toc::export 0.2 [list source [file join $dir export.tcl]] +package ifneeded doctools::toc::import 0.2 [list source [file join $dir import.tcl]] package ifneeded doctools::toc::export::doctoc 0.1 [list source [file join $dir export_doctoc.tcl]] package ifneeded doctools::toc::export::html 0.1 [list source [file join $dir export_html.tcl]] package ifneeded doctools::toc::export::json 0.1 [list source [file join $dir export_json.tcl]] package ifneeded doctools::toc::export::nroff 0.2 [list source [file join $dir export_nroff.tcl]] Index: modules/doctools2toc/toc_container.man ================================================================== --- modules/doctools2toc/toc_container.man +++ modules/doctools2toc/toc_container.man @@ -159,24 +159,24 @@ [call [arg objectName] [method up] [arg id]] This method returns the handle of the parent for the element identified by its handle [arg id], or the empty string if [arg id] -refered to the root element. +referred to the root element. [call [arg objectName] [method next] [arg id]] This method returns the handle of the right sibling for the element identified by its handle [arg id], or the handle of the parent if the -element has no right sibling, or the empty string if [arg id] refered +element has no right sibling, or the empty string if [arg id] referred to the root element. [call [arg objectName] [method prev] [arg id]] This method returns the handle of the left sibling for the element identified by its handle [arg id], or the handle of the parent if the -element has no left sibling, or the empty string if [arg id] refered +element has no left sibling, or the empty string if [arg id] referred to the root element. [call [arg objectName] [method child] [arg id] [arg label] [opt [arg ...]]] This method returns the handle of a child of the element identified by Index: modules/doctools2toc/toc_export.man ================================================================== --- modules/doctools2toc/toc_export.man +++ modules/doctools2toc/toc_export.man @@ -1,7 +1,8 @@ +[vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] -[manpage_begin doctools::toc::export n 0.1] +[manpage_begin doctools::toc::export n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] [keywords export] [keywords formatting] @@ -17,15 +18,15 @@ [keywords {table of contents}] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2018 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Exporting tables of contents}] [category {Documentation tools}] -[require doctools::toc::export [opt 0.1]] +[require doctools::toc::export [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::toc::structure] [require snit] [require pluginmgr] @@ -199,11 +200,11 @@ [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no -effect, these values will be internally overriden when invoking an +effect, these values will be internally overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified Index: modules/doctools2toc/toc_import.man ================================================================== --- modules/doctools2toc/toc_import.man +++ modules/doctools2toc/toc_import.man @@ -1,7 +1,8 @@ +[vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] -[manpage_begin doctools::toc::import n 0.1] +[manpage_begin doctools::toc::import n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] [keywords import] [keywords json] @@ -11,15 +12,15 @@ [keywords plugin] [keywords reference] [keywords table] [keywords {table of contents}] [keywords url] -[copyright {2009 Andreas Kupries }] +[copyright {2009-2018 Andreas Kupries }] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] -[require doctools::toc::import [opt 0.1]] +[require doctools::toc::import [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::toc::structure] [require snit] [require pluginmgr] @@ -209,11 +210,11 @@ [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no -effect, these values will be internally overriden when invoking an +effect, these values will be internally overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified Index: modules/doctools2toc/toc_parse.man ================================================================== --- modules/doctools2toc/toc_parse.man +++ modules/doctools2toc/toc_parse.man @@ -133,11 +133,11 @@ Each error element will be a list containing six strings describing an error in detail. The strings will be [list_begin enumerated] [enum] -The path of the file the error occured in. This may be empty. +The path of the file the error occurred in. This may be empty. [enum] The range of the token the error was found at. This range is a two-element list containing the offset of the first and last character in the range, counted from the beginning of the input (file). Offsets