[HT2HTML-devel] CVS: ht2html PDOGenerator.py,2.4,2.5

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

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

Modified Files:
	PDOGenerator.py 
Log Message:
get_meta():  Combine any additional metadata from the source file with
    anything returned from the default implementation.


Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** PDOGenerator.py	27 Mar 2002 03:59:48 -0000	2.4
--- PDOGenerator.py	28 Mar 2002 17:25:25 -0000	2.5
***************
*** 64,68 ****
  
      def get_meta(self):
!         return self.__parser.get('meta', '')
  
      def get_title(self):
--- 64,73 ----
  
      def get_meta(self):
!         s1 = Skeleton.get_meta(self)
!         s2 = self.__parser.get('meta', '')
!         if s1 and s2:
!             return s1 + "\n" + s2
!         else:
!             return s1 or s2
  
      def get_title(self):