ADDED common_links.tcl Index: common_links.tcl ================================================================== --- /dev/null +++ common_links.tcl @@ -0,0 +1,30 @@ +proc common_links {} { + hd_puts \ +{ +} +} Index: document_header.tcl ================================================================== --- document_header.tcl +++ document_header.tcl @@ -2,162 +2,82 @@ proc document_header {title path {search {}}} { set ret [subst -nocommands { + + $title - - + }] if {[file exists DRAFT]} { set tagline {*** DRAFT ***} } else { set tagline {Small. Fast. Reliable.
Choose any three.} } append ret [subst -nocommands { -
-
- -
-
${tagline}
- - - -
+
}] + regsub -all {\n+\s+} [string trim $ret] \n ret + regsub -all {\s*/\*[- a-z0-9A-Z"*\n]+\*/} $ret {} ret return $ret } Index: pages/about.in ================================================================== --- pages/about.in +++ pages/about.in @@ -1,41 +1,13 @@ About SQLite

About SQLite

- -
-See Also... -

-
+

SQLite is an in-process library that implements a self-contained, serverless, zero-configuration, Index: pages/capi3ref.in ================================================================== --- pages/capi3ref.in +++ pages/capi3ref.in @@ -218,42 +218,123 @@ regsub {^sqlite3_} $oldname {} oldname regsub { } $oldname _ name return $name.html } -# Output HTML that displays the list $lx in $N columns -# -proc output_list {title N lx} { - hd_putsnl {} - if {$title!=""} { - hd_putsnl "" - } - set len [llength $lx] - set n [expr {($len + $N - 1)/$N}] - for {set i 0} {$i<$N} {incr i} { - set start [expr {$i*$n}] - set end [expr {($i+1)*$n}] - hd_puts {} - } - hd_putsnl {
$title
    } - for {set j $start} {$j<$end} {incr j} { - set entry [lindex $lx $j] - if {$entry!=""} { - foreach {link label s} $entry break - if {$s==1} { - hd_resolve "
  • \[$link|$label\]  " - hd_resolve "\[experimental | (exp)\]
  • " - } elseif {$s==2} { - hd_resolve "
  • \[$link|$label\]  " - hd_resolve "\[deprecated | (obs)\]
  • " - } else { - hd_resolve "
  • \[$link|$label\]
  • " - } - hd_puts \n - } - } - hd_putsnl {
} +# Convert the keyword $kw into an appropriate relative URI +# +proc keyword_to_uri {kw} { + global hd llink glink + if {[string match {*.html} $kw]} {return $kw} + if {$hd(enable-main)} { + set fn $hd(fn-main) + if {[info exists llink($fn:$kw)]} { + return $hd(rootpath-main)$llink($fn:$kw) + } + if {[info exists glink($kw)]} { + return $hd(rootpath-main)$glink($kw) + } + } + if {$hd(enable-aux)} { + if {[info exists glink($kw)]} { + return $hd(rootpath-aux)$glink($kw) + } + } + return "" +} + +# Generate a Javascript table containing the URL and Label from $lx +# +proc output_list_javascript {lx} { + set sep {[} + foreach entry $lx { + foreach {link label s} $entry break + set url [keyword_to_uri $link] + hd_puts "${sep}{\"u\":\"$url\",\"x\":\"$label\",\"s\":$s}" + set sep ",\n" + } + hd_putsnl "\];" +} + +# Output HTML/JS that displays the list $lx in multiple columns +# under the assumption that each column is $w pixels wide. +# +# $lx is a list of triples. Each triple is {KEYWORD LABEL S}. The +# S determines a suffix added to each list element: +# +# 0: Add nothing (the default and common case) +# 1: Add the "(exp)" suffix +# 2: Strike through the text and do not hyperlink +# 3: Strike through the text and add ¹ +# 4: Add ² +# 5: Add ³ +# +# This routine is used to generate lists in other modules as well: +# lang.in, pragma.in, session.in. +# +proc output_list {title w lx} { + global listcount hd + if {![info exists listcount]} { + set listcount 1 + } else { + incr listcount + } + set tx listtab$listcount + set vx listitems$listcount + hd_puts "\n" + hd_putsnl "
" + hd_putsnl "" } hd_open_aux c3ref/intro.html hd_header Introduction hd_enable_main 0 @@ -441,11 +522,11 @@ hd_putsnl {

SQLite C Interface

} hd_enable_main 1

List Of Objects:

-output_list "" 3 [lsort -nocase $objlist] +output_list "" 280 [lsort -nocase $objlist] hd_enable_main 0 hd_putsnl {

Other lists: Constants and Functions and Result Codes.} @@ -479,11 +560,11 @@

List Of Constants:

Also available: [error codes|list of error codes]

set clist [lsort -index 1 $clist] -output_list "" 2 $clist +output_list "" 400 $clist hd_enable_main 0 hd_putsnl {

Other lists: Objects and Functions and Result Codes.

} @@ -515,16 +596,16 @@ hd_enable_main 0 hd_putsnl {

SQLite C Interface

} hd_enable_main 1

List Of Functions:

-

Note: Functions marked with "[experimental | (exp)]" -are [experimental] and functions marked with -[deprecated | (obs)] are [deprecated].

+

Note: Functions marked with "(exp)" +are [experimental] and functions whose names are +struck through are [deprecated].

set funclist [lsort -index 1 $funclist] -output_list "" 3 $funclist +output_list "" 315 $funclist hd_enable_main 0 hd_putsnl {

Other lists: Constants and Objects and Result Codes

} @@ -566,11 +647,11 @@ } set flst {} foreach x $lx { lappend flst [list $x $x 0] } - output_list ${label}s: 3 $flst + output_list ${label}s: 350 $flst hd_puts "

\n" } # Output all the records Index: pages/changes.in ================================================================== --- pages/changes.in +++ pages/changes.in @@ -4232,11 +4232,11 @@ set label [string map {. _} $vers] hd_fragment version_$label } hd_puts "

$date

" regsub -all {\yROOT/} $desc {} d2 - hd_resolve "