Commit graph

1 commit

Author SHA1 Message Date
yugui
7c74420ddc merges r21170 from trunk into ruby_1_9_1.
* lib/erb.rb (ERB): m17n of ERB. adds rdoc.
  fixes #712. c.f. [ruby-dev:37516].

* lib/erb.rb (ERB::Compiler#compile): recognizes magic comments.
  returns a pair of compiled script and its script encoding.

* lib/erb.rb (ERB#set_eoutvar): make generated scripts return a
  string in correct encoding.

* lib/erb.rb (ERB#def_method): use Kernel#eval for encoding-awareness
  of the evaluated string.

* bin/erb.rb (ERB::Main.run): adds -E and -U options.
  String is no longer Enumerable.

* man/erb.1: new manapage.

* test/erb/test_erb_m17n.rb: new test case for m17n features.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:08 +00:00