Merge branch 'upstream' into debian/sid

6 files changed, 20 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1e5d1412..066ed386 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,18 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.58.3.orig.tar.gz (2007-09-06:36/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.3.orig.tar.gz
+  sisu_0.58.3.orig.tar.gz
+  sisu_0.58.3-1.dsc
+  sisu_0.58.3-1.diff.gz
+
+  * param, identify markup type, fix, make sure distinguishable form standalone
+    markup identify module
+
+  * html & texpdf, cosmetic, 'copy @' reduced to smaller font size, consider
+    removing
+
 %% sisu_0.58.2.orig.tar.gz (2007-09-05:36/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.2.orig.tar.gz
   43826c427add52938ee89b38c5ae266f 1278561 sisu_0.58.2.orig.tar.gz
diff --git a/README b/README
index 1742d410..c0ce0687 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 SiSU 0.55 2007w27/6 2007-07-07
-homepage: <http://www.jus.uio.no/sisu>
+Homepage: <http://www.jus.uio.no/sisu>
 
 %% Description
 ---------------
@@ -29,6 +29,7 @@ homepage: <http://www.jus.uio.no/sisu>
     focus is primarily on content and data integrity rather than appearance,
     (though outputs in the various formats are respectable).
 
+  Syntax highlighting files for a number of editors are provided.
   A vim syntax highlighting file and an ftplugin with folds for sisu markup is
   provided. Vim 7 includes syntax highlighting for SiSU.
 
@@ -48,7 +49,7 @@ homepage: <http://www.jus.uio.no/sisu>
 
 SiSU - simple information structuring universe, is a publishing tool, document
 generation and management, (and search enabling) tool primarily for literary,
-academic and legal works.
+academic and legal published works.
 
 SiSU can be used for Internet, Intranet, local filesystem or cd publishing.
 
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index 29700e83..d9fa95c2 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -169,7 +169,7 @@ module SiSU_HTML_Format
 <!- home and index buttons -!>}
     end
     def copyat
-      %{#{@vz.paragraph_heading_1_center}copy @
+      %{#{@vz.paragraph_font_tiny}copy @
   <a href="#{@vz.url_home}" #{@vz.js_home}>
     #{@vz.txt_home}
   </a></h1>}
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index 690163d4..f4bf6a3f 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -197,7 +197,7 @@ module SiSU_Param
         @generated=Time.now
         fns_array=@data.dup
         skip unless fns_array                                                    # consider
-        @markup_version=SiSU_Markup::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version
+        @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version
         if fns_array[0] =~ /^(?:% )?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/ #check markup and markup version
           if fns_array[0] =~ /^(?:% )?(?:SiSU\s+(?:master\s+)?|sisu-)[\d.]+$/ #check markup and markup version
             @markup_version_declared=fns_array[0].match(/^(?:% )?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1]
diff --git a/lib/sisu/v0/param_identify_markup.rb b/lib/sisu/v0/param_identify_markup.rb
index 93c8bf79..fcdf71cb 100644
--- a/lib/sisu/v0/param_identify_markup.rb
+++ b/lib/sisu/v0/param_identify_markup.rb
@@ -56,7 +56,7 @@
     altering SiSU markup
 
 =end
-module SiSU_Markup
+module SiSU_Markup_type
   class Markup_identify
     @@fns,@@version_determined,@@version_declared,@@declared_doc_type='','','','[text?]'
     attr_accessor :version_determined,:version_declared,:declared_doc_type
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index cd4c2ec1..ccde6687 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -384,7 +384,7 @@ WOK
             end
           end
           @tex_file << unless @md.fnb =~/^mail\s*$/
-            "\n\\date{copy @ #{@tex.site} #{sisu_rc_footnote}}"
+            "\n\\date{\\begin{footnotesize} copy @ #{@tex.site} \\end{footnotesize} #{sisu_rc_footnote}}"
           else "\\date"
           end
         else #portrait
@@ -399,7 +399,7 @@ WOK
             else "\n\\author{#@copymark \\textnormal{#{creator}}}"
             end
            end
-          @tex_file << unless @md.fnb =~/^mail\s*$/; "\n\\date{copy @ #{@tex.site} #{sisu_rc_footnote}}"
+          @tex_file << unless @md.fnb =~/^mail\s*$/; "\n\\date{\\begin{footnotesize} copy @ #{@tex.site} \\end{footnotesize} #{sisu_rc_footnote}}"
           else                                       "\\date"
           end
         end