[HT2HTML-devel] CVS: ht2html Skeleton.py,2.6,2.7

[Fred L. D. <fd...@us...>]

Update of /cvsroot/ht2html/ht2html
In directory usw-pr-cvs1:/tmp/cvs-serv24951

Modified Files:
	Skeleton.py 
Log Message:
get_meta():  Default implementation returns the generator info.
__do_styles():  Simplify the generated <style> element; it didn't use to
    add the <!-- ... --> markup around the content, so let's not add it
    now.


Index: Skeleton.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** Skeleton.py	27 Mar 2002 03:59:48 -0000	2.6
--- Skeleton.py	28 Mar 2002 17:24:21 -0000	2.7
***************
*** 79,83 ****
      def get_meta(self):
          """Return extra meta-data.  Must be a string."""
!         return ''
  
      def get_headers(self):
--- 79,85 ----
      def get_meta(self):
          """Return extra meta-data.  Must be a string."""
!         import __main__
!         return '<meta name="generator" content="HT2HTML/%s">' \
!                % __main__.__version__
  
      def get_headers(self):
***************
*** 293,303 ****
                  % (stylesheet, type)
          if localstyle and localstyle.strip():
!             localstyle = localstyle.strip()
!             if not localstyle.startswith("<!--"):
!                 # XXX should check the HTML version we're trying to produce
!                 fmt = '<style type="text/css">\n<!--\n%s\n-->\n</style>'
!             else:
!                 fmt = '<style type="text/css">\n%s\n</style>'
!             localstyle = fmt % localstyle
              if stylesheet:
                  s = s + "\n" + localstyle
--- 295,300 ----
                  % (stylesheet, type)
          if localstyle and localstyle.strip():
!             localstyle = '<style type="text/css">\n%s\n</style>' \
!                          % localstyle.strip()
              if stylesheet:
                  s = s + "\n" + localstyle