[SCM] Render HTML and CSS content with tk branch, master, updated. 7d1ba86bc1253116387b677c55c541820268ee97

Ole Streicher debian at liska.ath.cx
Wed Feb 22 08:50:14 UTC 2012


The following commit has been merged in the master branch:
commit 7d1ba86bc1253116387b677c55c541820268ee97
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Feb 22 09:49:22 2012 +0100

    Remove last lintian warnings: spelling, hyphen, "control" sections etc.

diff --git a/debian/clean b/debian/clean
index 3a8e791..c87b99e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,3 +5,4 @@ htmltokens.c
 htmltokens.h
 hv3-0.1.tm
 tkhtml.n
+*.3tcl
diff --git a/debian/control b/debian/control
index 3424d70..1cf0785 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Priority: extra
 Maintainer: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 8.0.0), autotools-dev, tcl-dev, tk-dev
 Standards-Version: 3.9.2
-Section: libs
+Section: interpreters
 Homepage: http://tkhtml.tcl.tk/index.html
 Vcs-Git: git://git.debian.org/git/debian-science/packages/tkhtml3.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tkhtml3.git
 
 Package: tk-html3
-Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, tcl, tk
 Description: Render HTML and CSS content with tk
diff --git a/debian/patches/install_manpages.patch b/debian/patches/install_manpages.patch
index 27b62ab..6c724c0 100644
--- a/debian/patches/install_manpages.patch
+++ b/debian/patches/install_manpages.patch
@@ -1,13 +1,16 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Install the manpages in the proper section.
+Description: Install the manpages in the proper section. Fix trivial manpage 
+ spelling.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -208,7 +208,7 @@ libraries: $(HV3_LIB)
+@@ -208,7 +208,9 @@ libraries: $(HV3_LIB)
  #========================================================================
  
  doc:
 -	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.n
-+	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.3tcl
++	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man > tkhtml.3tcl
++	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/hv3.man > hv3.3tcl
++	$(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/browser.man> hv3browser.3tcl
  
  install: all install-binaries install-libraries install-doc
  
@@ -28,72 +31,92 @@ Description: Install the manpages in the proper section.
  	done
  
  test: binaries libraries
---- a/doc/browser.man
-+++ b/doc/browser.man
-@@ -1,4 +1,4 @@
--[TH ::hv3::browser n]
-+[TH ::hv3::browser 3tcl]
- 
- [Section Name]
- 	::hv3::browser - Web browser widget.
+--- a/doc/macros.tcl
++++ b/doc/macros.tcl
+@@ -71,6 +71,8 @@ proc process_text {input {nocommands 0}} {
+     regsub -all {_([^ \n]*)_} $output {\1}
+   ]
+ 
++  set output [string map { " -" " \\-" "\t-" "\t\\-" 
++                           "\t." "\t ." "'" "\""} $output ]
+   set output [string trim [strip_leading_tabs $output]]
+   set output [regsub -all {[\n]*REMOVELINEBREAK\n} $output \n]
+ 
+@@ -79,7 +81,7 @@ proc process_text {input {nocommands 0}} {
+ 
+ proc TH {name section} {
+   set date [clock format [clock seconds]]
+-  return "\n.TH \"$name\" \"$section\" \"$date\"\n"
++  return "\n.TH \"$name\" \"3tcl\" \"$date\"\n"
+ }
+ 
+ proc Section {args} {
 --- a/doc/html.man
 +++ b/doc/html.man
-@@ -1,5 +1,5 @@
- 
--[TH tkhtml n]
-+[TH tkhtml 3tcl]
- 
- [Section Name]
- 	tkhtml - Widget to render html documents.
-@@ -60,8 +60,8 @@
- 
- 		The seven integers define the sizes of the Tk fonts (in points)
- 		used when a CSS formatted document requests font-size
--		'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large' or
--		'xx-large', respectively.
-+		"xx-small", "x-small", "small", "medium", "large", "x-large" or
-+		"xx-large", respectively.
- 
- 		The default value is {8 9 10 11 13 15 17}.
-         }]
-@@ -831,12 +831,12 @@
- 		    .html style -id $id.9999 -importcmd $handler $stylesheet
- 		}
- 
--		.html handler script style script_handler
--		.html handler node link link_handler
-+		 .html handler script style script_handler
-+		 .html handler node link link_handler
- 
- 		set ::stylecount 0
- 
--		.html parse -final $document
-+		 .html parse -final $document
- }]
- 
- 	The complicated part of the example code above is the generation of
-@@ -873,14 +873,14 @@
- 		        ... rules ...
- 		    </style>
- 		    <link rel="stylesheet" href="D.css">
--		... remainder of document ...
-+		 ... remainder of document ...
- 
- 		#
- 		# Contents of B.css
- 		#
- 		
- 		@import "E.css"
--		... rules ...
-+		 ... rules ...
- }]
- 
- 	In the example above, the stylesheet documents A.css, B.css, C.css,
+@@ -36,7 +36,7 @@
+ 		The Tkhtml package adds the [SQ ::tkhtml::htmlstyle] command to
+ 		the interpreter it is loaded into. Invoking this command
+ 		returns a CSS document suitable for use with Tkhml as a default
+-		stylesheet for HTML documents. If the "-quirks" option is
++		stylesheet for HTML documents. If the -quirks option is
+ 		passed to [SQ ::tkhtml::htmlstyle] then the returned document
+ 		includes some extra rules used when rendering legacy documents.
+ 
+@@ -103,7 +103,7 @@
+ 		As well as for replacing entire document nodes (i.e. <img>),
+ 		images are used in several other contexts in CSS formatted
+ 		documents, for example as list markers or backgrounds. If the
+-		-imagecmd option is not set to an empty string (the default),
++		 -imagecmd option is not set to an empty string (the default),
+ 		then each time an image URI is encountered in the document, it
+ 		is appended to the -imagecmd script and the resulting list
+ 		evaluated.
+@@ -539,7 +539,7 @@
+ 
+ 		The [SQ pathName text text] command returns a string 
+ 		containing the raw, unformatted text of the displayed document.
+-		Each block box is seperated from the next by a newline
++		Each block box is separated from the next by a newline
+ 		character. Each block of whitespace is collapsed to a
+ 		single space, except within blocks with the CSS 'white-space'
+ 		property set to "pre".
+diff --git a/doc/hv3.man b/doc/hv3.man
+index fdc7513..3a5ac48 100644
 --- a/doc/hv3.man
 +++ b/doc/hv3.man
-@@ -1,4 +1,4 @@
--[TH hv3 n]
-+[TH hv3 3tcl]
+@@ -58,7 +58,7 @@
+ }]
  
- [Section Name]
- 	hv3 - Mega-widget building on Tkhtml.
+ 	The two most important interfaces are the [SQ goto] method and the
+-	_-requestcmd_ option. The [SQ goto] method tells the widget to
++	 _-requestcmd_ option. The [SQ goto] method tells the widget to
+ 	load the document identified by the specified absolute or relative
+ 	URI.
+ 
+@@ -67,7 +67,7 @@
+ 	users responsibility to retrieve the document and pass it back to
+ 	the widget. If the document contains links to external resources
+ 	(images or CSS stylesheets), then the widget invokes the 
+-	_-requestcmd_ script to request these. The _-requestcmd_ callback may
++	 _-requestcmd_ script to request these. The _-requestcmd_ callback may
+ 	choose to implement handling for one or more of http:// URIs, 
+ 	file:// URIs or any other existing or invented URI scheme. See
+ 	the "Example Usage" section below for an example.
+@@ -350,7 +350,7 @@
+ 	to display ready in a Tcl variable (or variables). The solution 
+ 	here is to invent a custom URI scheme to use within the 
+ 	application. For example, the following example demonstrates a
+-	_-requestcmd_ script that implements the "tclvar:", URI scheme
++	 _-requestcmd_ script that implements the "tclvar:", URI scheme
+ 	for refering to global Tcl variables.
+ 	
+ 	[Code {
+@@ -397,7 +397,7 @@
+ 	found at the start of each URI passed to [SQ tclvar_requestcmd]. This
+ 	is because Hv3 resolves and escapes all URIs against the base URI 
+ 	of the currently loaded document before passing them to the 
+-	_-requestcmd_. This means you need to be careful with special
++	 _-requestcmd_. This means you need to be careful with special
+ 	characters. If the name of the variable storing the stylesheet
+ 	document in the above example were _::css::my_stylesheet_, then
+ 	markup like this:
diff --git a/debian/rules b/debian/rules
index f7016b0..bf6d0cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ export DEB_BUILD_OPTIONS+=" nocheck"
 override_dh_auto_configure:
 	dh_auto_configure -- --libdir=/usr/lib/tcltk --mandir=/usr/share/man
 
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
 debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST))))
 get-orig-source:
 	sh '$(debiandir_SQ)'get-orig-source.sh

-- 
Render HTML and CSS content with tk



More information about the debian-science-commits mailing list