xmls, utf8 default, removed character translations
authorRalph Amissah <ralph@amissah.com>
Thu, 27 Feb 2020 17:26:00 +0000 (12:26 -0500)
committerRalph Amissah <ralph@amissah.com>
Thu, 27 Feb 2020 17:31:01 +0000 (12:31 -0500)
lib/sisu/prog_text_translation.rb
lib/sisu/shared_metadata.rb
lib/sisu/xhtml.rb
lib/sisu/xml_shared.rb

index a94053ef8b8ee4339e50610c325c224bb88b9598..3785cd9df2ea114fea730954cddf00dd1f396d3a 100644 (file)
@@ -336,7 +336,7 @@ module SiSU_Translate
     def author
       'Author'
     end
-    def author #dc
+    def creator #dc
       'Creator'
     end
     def contributor #dc
index c69aa7598164676bab59ea1796d46ed1d78d6e11..1e893ce92fae3a31cdd7d288bee8ba7203a26035 100644 (file)
@@ -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}
index 352168ccdb24ebcb9161f6c558682846fcc877a9..888f6f0c53dd8f7818276d6bf99e2bc2aa5b09cf 100644 (file)
@@ -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/ \
index 773043da793790a7f02748c1334c72a9bbb0425a..7d1aceb152677eaac19ad6d329a0b64637e6b8f7 100644 (file)
@@ -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