diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-12-28 12:46:53 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-12-28 12:46:53 -0500 |
| commit | e92c86268c6ecee130e80e9449f911d0764f65c0 (patch) | |
| tree | 988766818051a03efe55c3e2923c57887a5bbbb7 | |
| parent | v4 v3: html_segments (by_filename by_filetype) broken internal doc links fixed (diff) | |
v4 v3: param, minor change any legacy <br> line break in metadata markup to \\
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v3/param.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v4/param.rb | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 134b6bfe..1bd50fe0 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -40,6 +40,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.4.orig.tar.xz work filenames need to include lang code, fixed [chals on irc, re live-manual, debian-live] +* v3: param, minor change any legacy <br> line break in metadata markup to \\ + * v3: debug (internal code use), color markers for line number & file name (colored location markers to show when line passed within running code) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 326c56bc..4f822ee1 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.1.orig.tar.xz * v4: bin/sisu & sysenv, rc_path_options, provide fixed path to rc files, (used e.g. to load sisurc.yml) +* v4: param, minor change any legacy <br> line break in metadata markup to \\ + * v4: debug (internal code use), color markers for line number & file name (colored location markers to show when line passed within running code) diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index bffba529..3a4ea46d 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -227,6 +227,7 @@ module SiSU_Param if x =~/^%\s/ #ignore comment elsif x =~/:(\S+?):\s+(.+)/ a,b=/:(\S+?):\s+(.+)\Z/m.match(x)[1,2] + b=b.gsub(/\s*<br(?: \/)?>\s*/,' \\\\\\ ') b=if b =~/\n/m (b =~/;\n/m) \ ? (b.split(/;\s*\n\s*/).join(';')) diff --git a/lib/sisu/v4/param.rb b/lib/sisu/v4/param.rb index 40f9b983..b205ef6a 100644 --- a/lib/sisu/v4/param.rb +++ b/lib/sisu/v4/param.rb @@ -230,6 +230,7 @@ module SiSU_Param if x =~/^%\s/ #ignore comment elsif x =~/:(\S+?):\s+(.+)/ a,b=/:(\S+?):\s+(.+)\Z/m.match(x)[1,2] + b=b.gsub(/\s*<br(?: \/)?>\s*/,' \\\\\\ ') b=if b =~/\n/m (b =~/;\n/m) \ ? (b.split(/;\s*\n\s*/).join(';')) |