Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch doctools-typos-gn Excluding Merge-Ins
This is equivalent to a diff from 738baecbc3 to ede38cc0f5
2018-02-02
| ||
03:48 | Merge to release RC: GN patches for doctools and markdown. check-in: a43c4df501 user: aku tags: tcllib-1-19-rc | |
03:38 | Merge to trunk: GN patches for doctools and markdown. check-in: 744a6b43a2 user: aku tags: trunk | |
02:33 | Pulling fixes from trunk check-in: f8e9464473 user: hypnotoad tags: hypnotoad | |
2018-02-01
| ||
18:33 | doctools2idx <D> Fixed documentation typos, code comment typos doctools2toc s.a doctools s.a Patch by Gustaf Neumann <[email protected]>, thank you. Closed-Leaf check-in: ede38cc0f5 user: aku tags: doctools-typos-gn | |
18:31 | doctools2idx / doctools::idx::{export,import} <B,D> Fixed code typos (variable name), doc typos doctools2toc / doctools::toc::{export,import} s.a. Patch by Gustaf Neumann <[email protected]>, thank you. check-in: 27df9fe99f user: aku tags: doctools-typos-gn | |
04:47 | markdown / markdown <EF> - Applied patch adding syntax highlighting for `fenced code blocks` to the markdown package. Patch received from Gustaf Neumann <[email protected]>, with thanks. Closed-Leaf check-in: 924478eb48 user: aku tags: markdown-syntax-highlight-gn | |
2018-01-24
| ||
20:36 | Tkt [8fd2561785] oauth/oauth <B,D> Merged fix of query default to GET, was POST. check-in: 738baecbc3 user: aku tags: trunk | |
19:11 | Tkt [c247ed5db4] ldap/ldap <B,D>. Merge of fix for protocol error. check-in: 0826350f8d user: aku tags: trunk | |
2017-05-29
| ||
20:56 | Manually applied the patch from the ticket. Further some cleanup and simplification (Use 8.5 features (lassign, {*})) Closed-Leaf check-in: a0ec57b1bd user: aku tags: tkt-8fd2561785-ak | |
Changes to modules/doctools/checker.tcl.
︙ | ︙ | |||
308 309 310 311 312 313 314 | Enter description if {[IsNot header]} {Error hdrcmd} Go body fmt_description [Sectdef section Description description] } # Storage for (sub)section ids to enable checking for ambigous | | | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 | Enter description if {[IsNot header]} {Error hdrcmd} Go body fmt_description [Sectdef section Description description] } # Storage for (sub)section ids to enable checking for ambigous # 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) global countersection global countersubsection |
︙ | ︙ |
Changes to modules/doctools/checker_toc.tcl.
︙ | ︙ | |||
68 69 70 71 72 73 74 | # ==============+=======================+====================== # toc_begin | toc_begin | -> contents # --------------+-----------------------+---------------------- # contents | item | -> contents # division | | -> division # --------------+-----------------------+---------------------- # contents | division_start | -> end, PUSH division | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | # ==============+=======================+====================== # toc_begin | toc_begin | -> contents # --------------+-----------------------+---------------------- # contents | item | -> contents # division | | -> division # --------------+-----------------------+---------------------- # contents | division_start | -> end, PUSH division # division | | -> division, PUSH division # end | | PUSH division # --------------+-----------------------+---------------------- # division | division_end | POP (-> division / -> end) # --------------+-----------------------+---------------------- # contents | toc_end | -> done # end | | -> done # --------------+-----------------------+---------------------- |
︙ | ︙ |
Changes to modules/doctools/doctools.man.
︙ | ︙ | |||
438 439 440 441 442 443 444 | [def xref] 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 | | | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 | [def xref] 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 occurrence of the pattern will be used. [para] The engine will consult the xref database when encountering specific commands and will create a link if the relevant text matches one of the patterns. No link will be created if no match was found. The link |
︙ | ︙ |
Changes to modules/doctools/mpformats/_text.tcl.
︙ | ︙ | |||
74 75 76 77 78 79 80 | global pEnv ; array set pEnv {} ; # Defined paragraph environments (bulleting, indentation, other). global para ; set para "" ; # Text buffer for paragraphs. 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. | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | global pEnv ; array set pEnv {} ; # Defined paragraph environments (bulleting, indentation, other). global para ; set para "" ; # Text buffer for paragraphs. 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 ; # Suppression of plain text in some places. ################################################################ # Management of the current context. proc Text {text} {global para ; append para $text ; return} proc Store {op args} {global cmds ; lappend cmds [list $op $args] ; return} proc Off {} {global off ; set off 1 ; return} |
︙ | ︙ |
Changes to modules/doctools/mpformats/c.msg.
︙ | ︙ | |||
28 29 30 31 32 33 34 | mcset c tkoption_list "Command restricted to usage in tkoption lists" mcset c depr_strong "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead." 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." | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | mcset c tkoption_list "Command restricted to usage in tkoption lists" mcset c depr_strong "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead." 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 "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." mcset c toc/begincmd "Command not allowed here." mcset c toc/endcmd "Command not allowed here." |
︙ | ︙ |
Changes to modules/doctools/mpformats/en.msg.
︙ | ︙ | |||
28 29 30 31 32 33 34 | mcset en tkoption_list "Command restricted to usage in tkoption lists" mcset en depr_strong "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead." 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." | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | mcset en tkoption_list "Command restricted to usage in tkoption lists" mcset en depr_strong "Deprecated command \"%s\".\n\tPlease consider appropriate semantic markup or \[emph\] instead." 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 "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." mcset en toc/titlecmd "Command not allowed here." mcset en toc/sectcmd "Command not allowed here." |
︙ | ︙ |
Changes to modules/doctools/mpformats/fmt.html.
︙ | ︙ | |||
266 267 268 269 270 271 272 | if {$lastlevel > 1 } { append result [tag/ ul] \n } if {$close} { append result [tag/ li] \n } append result [tag/ ul] \n # Implicit sections coming after the TOC (Synopsis, then the # description which starts the actual document). The other | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | if {$lastlevel > 1 } { append result [tag/ ul] \n } if {$close} { append result [tag/ li] \n } append result [tag/ ul] \n # Implicit sections coming after the TOC (Synopsis, then the # description which starts the actual document). The other # 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 != {}} { append result [tag_ ul \n$req\n class doctools_requirements] \n } |
︙ | ︙ |
Changes to modules/doctools/mpformats/fmt.latex.
︙ | ︙ | |||
335 336 337 338 339 340 341 | proc fmt_file {text} {return "\"[Italic $text]\""} proc fmt_namespace {text} {Bold $text]} proc fmt_uri {text {label {}}} { if {$label == {}} { # Without label we use the link directly as part of the text. return [Underline $text] } else { | | | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | proc fmt_file {text} {return "\"[Italic $text]\""} proc fmt_namespace {text} {Bold $text]} 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, referred link is delegated into a # footnote. return "[Underline $label] \1\\footnote\{[texEscape $text]\}" } } proc fmt_image {text {label {}}} { global _has_images # text = symbolic name of the image. |
︙ | ︙ |
Changes to modules/doctools2idx/export.tcl.
|
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 | # export.tcl -- # # Exporting indices into other formats. # # Copyright (c) 2009-2018 Andreas Kupries <[email protected]> # # 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 $ # Each object manages a set of plugins for the conversion of keyword |
︙ | ︙ | |||
63 64 65 66 67 68 69 | if {!$iscanonical} { set serial [doctools::idx::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | if {!$iscanonical} { set serial [doctools::idx::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) lappend configuration format [$plugin plugin] return [$plugin do export $serial $configuration] } # ### ### ### ######### ######### ######### ## Internal methods |
︙ | ︙ | |||
117 118 119 120 121 122 123 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready | | | 117 118 119 120 121 122 123 124 125 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready package provide doctools::idx::export 0.2 return |
Changes to modules/doctools2idx/idx_export.man.
1 | [comment {-*- tcl -*- doctools manpage}] | > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | [vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::idx::export n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] [keywords export] [keywords formatting] [keywords generation] [keywords HTML] [keywords index] [keywords json] [keywords {keyword index}] [keywords manpage] [keywords markup] [keywords nroff] [keywords plugin] [keywords reference] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] [copyright {2009-2018 Andreas Kupries <[email protected]>}] [moddesc {Documentation tools}] [titledesc {Exporting keyword indices}] [category {Documentation tools}] [require doctools::idx::export [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::idx::structure] [require snit] [require pluginmgr] [description] |
︙ | ︙ | |||
197 198 199 200 201 202 203 | If no value is specified it simply returns the current value, without changing it. [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | If no value is specified it simply returns the current value, without changing it. [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 overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified glob [arg pattern]s. If no pattern is specified it will unset all currently defined configuration variables. |
︙ | ︙ |
Changes to modules/doctools2idx/idx_import.man.
1 | [comment {-*- tcl -*- doctools manpage}] | > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | [vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::idx::import n [vset VERSION]] [keywords conversion] [keywords docidx] [keywords documentation] [keywords import] [keywords index] [keywords json] [keywords {keyword index}] [keywords manpage] [keywords markup] [keywords parsing] [keywords plugin] [keywords reference] [keywords url] [copyright {2009-2018 Andreas Kupries <[email protected]>}] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] [require doctools::idx::import [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::idx::structure] [require snit] [require pluginmgr] [description] |
︙ | ︙ | |||
207 208 209 210 211 212 213 | If no value is specified it simply returns the current value, without changing it. [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no | | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | If no value is specified it simply returns the current value, without changing it. [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 overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified glob [arg pattern]s. If no pattern is specified it will unset all currently defined configuration variables. |
︙ | ︙ |
Changes to modules/doctools2idx/idx_parse.man.
︙ | ︙ | |||
131 132 133 134 135 136 137 | [enum] Each error element will be a list containing six strings describing an error in detail. The strings will be [list_begin enumerated] [enum] | | | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | [enum] 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 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 are counted from zero. |
︙ | ︙ |
Changes to modules/doctools2idx/import.tcl.
|
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 | # import.tcl -- # # Importing indices into other formats. # # Copyright (c) 2009-2018 Andreas Kupries <[email protected]> # # 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 $ # Each object manages a set of plugins for the conversion of keyword |
︙ | ︙ | |||
66 67 68 69 70 71 72 | # ### ### ### ######### ######### ######### method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | # ### ### ### ######### ######### ######### method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) lappend configuration format [$plugin plugin] return [$plugin do import $text $configuration] } method {import file} {path {format {}}} { # The plugin is not trusted to handle the file to convert. return [$self import text [fileutil::cat $path] $format] |
︙ | ︙ | |||
183 184 185 186 187 188 189 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready | | | 183 184 185 186 187 188 189 190 191 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready package provide doctools::idx::import 0.2 return |
Changes to modules/doctools2idx/import_json.tcl.
︙ | ︙ | |||
63 64 65 66 67 68 69 | proc import {text configuration} { # 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 | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | proc import {text configuration} { # 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 occurrences. return [doctools::idx::structure canonicalize [json::json2dict $text]] } # ### ### ### ######### ######### ######### ## Ready package provide doctools::idx::import::json 0.1 |
︙ | ︙ |
Changes to modules/doctools2idx/include/serialization.inc.
︙ | ︙ | |||
61 62 63 64 65 66 67 | [enum] 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, | | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | [enum] 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, referring to one of the documents the index was made for. [def [const url]] 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 --}] [def {canonical serialization}] |
︙ | ︙ |
Changes to modules/doctools2idx/parse.tcl.
︙ | ︙ | |||
10 11 12 13 14 15 16 | # attributes for reference and label. # # 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, | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | # attributes for reference and label. # # 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. 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 package require Tcl 8.4 ; # Required runtime. |
︙ | ︙ |
Changes to modules/doctools2idx/pkgIndex.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | if {![package vsatisfies [package provide Tcl] 8.4]} {return} # Packages for the doctools idx v2 implementation # (still v1.1 docidx language). # - Index container, mutable index objects # - Export and import management # - Export and import plugins # - Parser for docidx markup, and handling serializations # - Message catalogs for the parser package ifneeded doctools::idx 2 [list source [file join $dir container.tcl]] | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | if {![package vsatisfies [package provide Tcl] 8.4]} {return} # Packages for the doctools idx v2 implementation # (still v1.1 docidx language). # - Index container, mutable index objects # - Export and import management # - Export and import plugins # - 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.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]] package ifneeded doctools::idx::export::text 0.2 [list source [file join $dir export_text.tcl]] package ifneeded doctools::idx::export::wiki 0.2 [list source [file join $dir export_wiki.tcl]] |
︙ | ︙ |
Changes to modules/doctools2toc/ChangeLog.
︙ | ︙ | |||
38 39 40 41 42 43 44 | * * Released and tagged Tcllib 1.12 ======================== * 2009-11-14 Andreas Kupries <[email protected]> | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | * * Released and tagged Tcllib 1.12 ======================== * 2009-11-14 Andreas Kupries <[email protected]> * 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: * export_json.tcl: * export_json.test: |
︙ | ︙ |
Changes to modules/doctools2toc/export.tcl.
|
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 | # export.tcl -- # # Exporting indices into other formats. # # Copyright (c) 2009-2018 Andreas Kupries <[email protected]> # # 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 $ # Each object manages a set of plugins for the conversion of keyword |
︙ | ︙ | |||
63 64 65 66 67 68 69 | if {!$iscanonical} { set serial [doctools::toc::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | if {!$iscanonical} { set serial [doctools::toc::structure canonicalize $serial] } set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) lappend configuration format [$plugin plugin] return [$plugin do export $serial $configuration] } # ### ### ### ######### ######### ######### ## Internal methods |
︙ | ︙ | |||
117 118 119 120 121 122 123 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready | | | 117 118 119 120 121 122 123 124 125 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready package provide doctools::toc::export 0.2 return |
Changes to modules/doctools2toc/export_doctoc.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 | # doctoc.tcl -- # # The doctoc export plugin. Generation of doctoc markup. # # Copyright (c) 2009 Andreas Kupries <[email protected]> # # See the file "license.terms" for information on usage and redistribution # 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 | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # doctoc.tcl -- # # The doctoc export plugin. Generation of doctoc markup. # # Copyright (c) 2009 Andreas Kupries <[email protected]> # # See the file "license.terms" for information on usage and redistribution # 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 contents and produces text in # doctoc format. # ### ### ### ######### ######### ######### ## Requisites # @mdgen NODEP: doctools::toc::export::plugin |
︙ | ︙ |
Changes to modules/doctools2toc/import.tcl.
|
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 | # import.tcl -- # # Importing indices into other formats. # # Copyright (c) 2009-2018 Andreas Kupries <[email protected]> # # 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 $ # Each object manages a set of plugins for the conversion of keyword |
︙ | ︙ | |||
66 67 68 69 70 71 72 | # ### ### ### ######### ######### ######### method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | # ### ### ### ######### ######### ######### method {import text} {text {format {}}} { set plugin [$self GetPlugin $format] set configuration [$myconfig get] lappend configuration user $::tcl_platform(user) lappend configuration format [$plugin plugin] return [$plugin do import $text $configuration] } method {import file} {path {format {}}} { # The plugin is not trusted to handle the file to convert. return [$self import text [fileutil::cat $path] $format] |
︙ | ︙ | |||
183 184 185 186 187 188 189 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready | | | 183 184 185 186 187 188 189 190 191 | ## # ### ### ### ######### ######### ######### } # ### ### ### ######### ######### ######### ## Ready package provide doctools::toc::import 0.2 return |
Changes to modules/doctools2toc/import_json.tcl.
︙ | ︙ | |||
62 63 64 65 66 67 68 | proc import {text configuration} { # 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 | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | proc import {text configuration} { # 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 occurrences. return [doctools::toc::structure canonicalize [json::json2dict $text]] } # ### ### ### ######### ######### ######### ## Ready package provide doctools::toc::import::json 0.1 |
︙ | ︙ |
Changes to modules/doctools2toc/parse.tcl.
︙ | ︙ | |||
9 10 11 12 13 14 15 | # - children of divisions = if any, elements of the division, references and divisions. # # 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, | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | # - children of divisions = if any, elements of the division, references and divisions. # # 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. 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 package require Tcl 8.4 ; # Required runtime. |
︙ | ︙ |
Changes to modules/doctools2toc/pkgIndex.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | if {![package vsatisfies [package provide Tcl] 8.4]} {return} # Packages for the doctools toc v2 implementation # (still v1.1 doctoc language). # - Index container, mutable toc objects # - Export and import management # - Export and import plugins # - Parser for doctoc markup, and handling serializations # - Message catalogs for the parser package ifneeded doctools::toc 2 [list source [file join $dir container.tcl]] | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | if {![package vsatisfies [package provide Tcl] 8.4]} {return} # Packages for the doctools toc v2 implementation # (still v1.1 doctoc language). # - Index container, mutable toc objects # - Export and import management # - Export and import plugins # - 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.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]] package ifneeded doctools::toc::export::text 0.1 [list source [file join $dir export_text.tcl]] package ifneeded doctools::toc::export::wiki 0.1 [list source [file join $dir export_wiki.tcl]] |
︙ | ︙ |
Changes to modules/doctools2toc/toc_container.man.
︙ | ︙ | |||
157 158 159 160 161 162 163 | The result of the method is the empty string. [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] | | | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | The result of the method is the empty string. [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] 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] 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] 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 its handle [arg id]. The child itself is identified by a series of labels. |
︙ | ︙ |
Changes to modules/doctools2toc/toc_export.man.
1 | [comment {-*- tcl -*- doctools manpage}] | > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | [vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::toc::export n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] [keywords export] [keywords formatting] [keywords generation] [keywords HTML] [keywords json] [keywords manpage] [keywords markup] [keywords nroff] [keywords plugin] [keywords reference] [keywords table] [keywords {table of contents}] [keywords {tcler's wiki}] [keywords text] [keywords url] [keywords wiki] [copyright {2009-2018 Andreas Kupries <[email protected]>}] [moddesc {Documentation tools}] [titledesc {Exporting tables of contents}] [category {Documentation tools}] [require doctools::toc::export [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::toc::structure] [require snit] [require pluginmgr] [description] |
︙ | ︙ | |||
197 198 199 200 201 202 203 | If no value is specified it simply returns the current value, without changing it. [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | If no value is specified it simply returns the current value, without changing it. [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 overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified glob [arg pattern]s. If no pattern is specified it will unset all currently defined configuration variables. |
︙ | ︙ |
Changes to modules/doctools2toc/toc_import.man.
1 | [comment {-*- tcl -*- doctools manpage}] | > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | [vset VERSION 0.2] [comment {-*- tcl -*- doctools manpage}] [manpage_begin doctools::toc::import n [vset VERSION]] [keywords conversion] [keywords doctoc] [keywords documentation] [keywords import] [keywords json] [keywords manpage] [keywords markup] [keywords parsing] [keywords plugin] [keywords reference] [keywords table] [keywords {table of contents}] [keywords url] [copyright {2009-2018 Andreas Kupries <[email protected]>}] [moddesc {Documentation tools}] [titledesc {Importing keyword indices}] [category {Documentation tools}] [require doctools::toc::import [opt [vset VERSION]]] [require Tcl 8.4] [require doctools::config] [require doctools::toc::structure] [require snit] [require pluginmgr] [description] |
︙ | ︙ | |||
207 208 209 210 211 212 213 | If no value is specified it simply returns the current value, without changing it. [para] Note that while the user can set the predefined configuration variables [const user] and [const format] doing so will have no | | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | If no value is specified it simply returns the current value, without changing it. [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 overridden when invoking an import plugin. [call [arg objectName] [method {config unset}] [arg pattern]...] This method unsets all configuration variables matching the specified glob [arg pattern]s. If no pattern is specified it will unset all currently defined configuration variables. |
︙ | ︙ |
Changes to modules/doctools2toc/toc_parse.man.
︙ | ︙ | |||
131 132 133 134 135 136 137 | [enum] Each error element will be a list containing six strings describing an error in detail. The strings will be [list_begin enumerated] [enum] | | | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | [enum] 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 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 are counted from zero. |
︙ | ︙ |