diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-12-02 03:19:07 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-12-02 03:22:23 -0500 |
| commit | 83f669a0908f123c7703e9b5b7d587fb7580c5ab (patch) | |
| tree | a12f69fcd8fa1df3c320c537885fdb9e3a80770f /lib | |
| parent | v3: 3.1.6 version & changelog "opened" (diff) | |
v3, require iconv (removed), should use String#encode instead, watch
* removed iconv, required a number of places without being used, watch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v3/dal_character_check.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v3/shared_xml.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v3/sst_do_inline_footnotes.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v3/texpdf_format.rb | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/lib/sisu/v3/dal_character_check.rb b/lib/sisu/v3/dal_character_check.rb index bf393b76..c2109b9a 100644 --- a/lib/sisu/v3/dal_character_check.rb +++ b/lib/sisu/v3/dal_character_check.rb @@ -64,7 +64,6 @@ module SiSU_character_check @endnote_array=[] end def character_check_and_oldstyle_endnote_array - require 'iconv' data=@data @tuned_file,@endnote_array=[],[] endnote_no=1 diff --git a/lib/sisu/v3/shared_xml.rb b/lib/sisu/v3/shared_xml.rb index a1a68593..f6cd6598 100644 --- a/lib/sisu/v3/shared_xml.rb +++ b/lib/sisu/v3/shared_xml.rb @@ -109,7 +109,7 @@ module SiSU_XML_munge end def char_enc #character encode def utf8(dob='') - if @sys.locale =~/utf-?8/i # instead ucs for utf8 #require 'iconv' ? Iñtërnâtiônàlizætiøn + if @sys.locale =~/utf-?8/i # instead ucs for utf8 # String#encode Iñtërnâtiônàlizætiøn str=if defined? dob.obj; dob.obj elsif dob.class==String; dob end @@ -224,7 +224,7 @@ module SiSU_XML_munge end end def html(dob='') - if @sys.locale =~/utf-?8/i # instead ucs for utf8 #require 'iconv' ? Iñtërnâtiônàlizætiøn + if @sys.locale =~/utf-?8/i # instead ucs for utf8 # String#encode Iñtërnâtiônàlizætiøn dob.obj.gsub!(/ /u,' ') # space identify dob.obj.gsub!(/ /u,' ') # space identify else diff --git a/lib/sisu/v3/sst_do_inline_footnotes.rb b/lib/sisu/v3/sst_do_inline_footnotes.rb index 60247060..14d60ea0 100644 --- a/lib/sisu/v3/sst_do_inline_footnotes.rb +++ b/lib/sisu/v3/sst_do_inline_footnotes.rb @@ -217,7 +217,6 @@ module SiSU_Convert_footnotes tuned_file end def character_check - require 'iconv' reset data=@data @tuned_file=[] diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index 34169892..71a8c989 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -80,7 +80,6 @@ module SiSU_TeX_Pdf end end class Format_text_object - require 'iconv' require_relative 'defaults' # defaults.rb attr_accessor :string,:string1,:orientation,:url,:dir,:tex @@sys=SiSU_Env::System_call.new @@ -1150,7 +1149,7 @@ WOK @tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine end def xetex_special_characters_1(str,is='') # ~ ^ $ & % _ { } #LaTeX special characters - KEEP list - #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) + #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) # `require': iconv will be deprecated in the future, use String#encode instead. word=str.scan(/\S+|\n/) #unless line =~/^(?:@\S|%+\s)/ para_array=[] str=if word |