From 09505b00a40de484380d34d9426f8b9efbb3bbde Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 27 Feb 2020 12:26:00 -0500
Subject: xmls, utf8 default, removed character translations

---
 lib/sisu/prog_text_translation.rb | 2 +-
 lib/sisu/shared_metadata.rb       | 7 -------
 lib/sisu/xhtml.rb                 | 1 -
 lib/sisu/xml_shared.rb            | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/prog_text_translation.rb b/lib/sisu/prog_text_translation.rb
index a94053ef..3785cd9d 100644
--- a/lib/sisu/prog_text_translation.rb
+++ b/lib/sisu/prog_text_translation.rb
@@ -336,7 +336,7 @@ module SiSU_Translate
     def author
       'Author'
     end
-    def author #dc
+    def creator #dc
       'Creator'
     end
     def contributor #dc
diff --git a/lib/sisu/shared_metadata.rb b/lib/sisu/shared_metadata.rb
index c69aa759..1e893ce9 100644
--- a/lib/sisu/shared_metadata.rb
+++ b/lib/sisu/shared_metadata.rb
@@ -72,7 +72,6 @@ module SiSU_Metadata
         content=if not content.nil?
           content=content.tr('"',"'").
             gsub(/&/,'&amp;')
-          content=SiSU_XML_Munge::Trans.new(@md).char_enc.utf8(content)
         else content
         end
       end
@@ -813,7 +812,6 @@ module SiSU_Metadata
     def xml_docbook
       def meta_para
         inf_xml=char_enc(@inf).amp
-        inf_xml=char_enc(inf_xml).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
 #{Ax[:tab]}<#{@tag}>
@@ -829,7 +827,6 @@ WOK
     def html_display
       def meta_para
         inf_xml=char_enc(@inf).amp
-        inf_xml=char_enc(inf_xml).utf8
         inf_xml=char_enc(inf_xml).br
         %{<p class="norm">
   <b>#{@tag}</b>: #{inf_xml}
@@ -842,7 +839,6 @@ WOK
     end
     def xml_sax
       def meta_para
-        inf_xml=char_enc(@inf).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
 <metadata>
@@ -861,7 +857,6 @@ WOK
     def xml_dom
       def meta_para
         inf_xml=char_enc(inf_xml).amp
-        inf_xml=char_enc(@inf).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
 #{Ax[:tab]}<header>
@@ -880,7 +875,6 @@ WOK
     def xhtml_scroll
       def meta_para
         inf_xml=char_enc(inf_xml).amp
-        inf_xml=char_enc(@inf).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
 #{Ax[:tab]}<metadata>
@@ -900,7 +894,6 @@ WOK
     def xhtml_display
       def meta_para
         inf_xml=char_enc(@inf).amp
-        inf_xml=char_enc(inf_xml).utf8
         inf_xml=char_enc(inf_xml).br
         %{<p class="norm">
   <b>#{@tag}</b>: #{inf_xml}
diff --git a/lib/sisu/xhtml.rb b/lib/sisu/xhtml.rb
index 352168cc..888f6f0c 100644
--- a/lib/sisu/xhtml.rb
+++ b/lib/sisu/xhtml.rb
@@ -307,7 +307,6 @@ WOK
         (0..7).each { |x| @cont[x]=@level[x]=false }
         (4..7).each { |x| @xml_contents_close[x]='' }
         data.each do |dob|
-          dob=@trans.char_enc.utf8(dob) if @sys.locale =~/utf-?8/i #% utf8
           dob=@trans.markup(dob)
           if @rcdc==false \
           and (dob.obj =~/~meta/ \
diff --git a/lib/sisu/xml_shared.rb b/lib/sisu/xml_shared.rb
index 773043da..7d1aceb1 100644
--- a/lib/sisu/xml_shared.rb
+++ b/lib/sisu/xml_shared.rb
@@ -598,7 +598,6 @@ module SiSU_XML_Tags #Format
       content=if not content.nil?
         content=content.tr('"',"'").
            gsub(/&/,'&amp;')
-        content=SiSU_XML_Munge::Trans.new(@md).char_enc.utf8(content)
       else content
       end
     end
-- 
cgit v1.2.3