diff --git a/ext/fts5/extract_api_docs.tcl b/ext/fts5/extract_api_docs.tcl index 27f136a99b..afb2699be5 100644 --- a/ext/fts5/extract_api_docs.tcl +++ b/ext/fts5/extract_api_docs.tcl @@ -134,6 +134,7 @@ proc get_api_docs {data} { # set D [get_struct_docs $data [array names M]] + output "<dl>" foreach {sub docs} $D { if {[info exists M($sub)]} { set hdr $M($sub) @@ -142,12 +143,17 @@ proc get_api_docs {data} { set link "" } - output "<hr color=#eeeee style=\"margin:1em 8.4ex 0 8.4ex;\"$link>" - set style "padding-left:6ex;font-size:1.4em;display:block" - output "<h style=\"$style\"><pre>$hdr</pre></h>" + #output "<hr color=#eeeee style=\"margin:1em 8.4ex 0 8.4ex;\"$link>" + #set style "padding-left:6ex;font-size:1.4em;display:block" + #output "<h style=\"$style\"><pre>$hdr</pre></h>" + + regsub -line {^ *[)]} $hdr ")" hdr + output "<dt style=\"white-space:pre;font-family:monospace;font-size:120%\"" + output "$link>" + output "<b>$hdr</b></dt><dd>" set mode "" - set bEmpty 1 + set margin " style=margin-top:0.1em" foreach line [split [string trim $docs] "\n"] { if {[string trim $line]==""} { if {$mode != ""} {output "</$mode>"} @@ -158,12 +164,15 @@ proc get_api_docs {data} { } else { set mode p } - output "<$mode>" + output "<$mode$margin>" + set margin "" } output $line } if {$mode != ""} {output "</$mode>"} + output "</dd>" } + output "</dl>" } proc get_fts5_struct {data start end} { diff --git a/manifest b/manifest index 56929d7dc1..7d1324ea39 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improve\sthe\sperformance\sof\sdocid\smerges\sin\sfts5. -D 2015-07-09T20:46:35.829 +C Fix\sinconsistencies\sin\sformatting\sof\sfts5\sdocs. +D 2015-07-10T17:55:42.512 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 017bf0511d1b2dd1db5e16488fbf75a17b526cbc F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -104,7 +104,7 @@ F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7 F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95 -F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a +F ext/fts5/extract_api_docs.tcl 06583c935f89075ea0b32f85efa5dd7619fcbd03 F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba F ext/fts5/fts5Int.h 8d9bce1847a10df2e4ed9492ea4f3868276748fb F ext/fts5/fts5_aux.c 7cd0e2858171dacf505fea4e2e84ee6126854c3d @@ -1365,7 +1365,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 898618ccf61d3ad166d9fc742e132d518338b5c3 -R 67cbb00207cd0d10d2422bd26a9385a8 +P b2de77a01cc5edcea2f98f7916e64cb33e6bd414 +R 7c08478f15e7cb3428a462d66cb461c5 U dan -Z ab9be791b136092de6b55e47372c8b3c +Z eba5e30eba51a8866d4bf4dc68e41c5e diff --git a/manifest.uuid b/manifest.uuid index b82d7bb75b..f05b61bf94 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b2de77a01cc5edcea2f98f7916e64cb33e6bd414 \ No newline at end of file +5fb4c77163be8d5ff1e2934dda3cc2ad0a6267e8 \ No newline at end of file