aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-01 00:39:28 -0400
committerRalph Amissah <ralph@amissah.com>2014-07-01 00:39:30 -0400
commit418716166677579b407653959f5d7e8947a4579d (patch)
tree894cb8dd867b144b7d80966b838e09e39e722c42
parentvim syntax, version & date (code block, language syntax; box group; quote) (diff)
v5 v6: files renamed: ao_composite.rb, html_concordance.rb
* ao_composite.rb (from composite.rb) * html_concordance.rb (from concordance.rb)
-rw-r--r--lib/sisu/v5/ao_composite.rb (renamed from lib/sisu/v5/composite.rb)2
-rw-r--r--lib/sisu/v5/html_concordance.rb (renamed from lib/sisu/v5/concordance.rb)0
-rw-r--r--lib/sisu/v5/hub.rb4
-rw-r--r--lib/sisu/v5/po4a.rb2
-rw-r--r--lib/sisu/v5/remote.rb2
-rw-r--r--lib/sisu/v6/ao_composite.rb (renamed from lib/sisu/v6/composite.rb)2
-rw-r--r--lib/sisu/v6/html_concordance.rb (renamed from lib/sisu/v6/concordance.rb)2
-rw-r--r--lib/sisu/v6/hub.rb4
-rw-r--r--lib/sisu/v6/po4a.rb2
-rw-r--r--lib/sisu/v6/remote.rb2
10 files changed, 11 insertions, 11 deletions
diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/ao_composite.rb
index 9f722799..9fd42672 100644
--- a/lib/sisu/v5/composite.rb
+++ b/lib/sisu/v5/ao_composite.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/composite.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_composite.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/concordance.rb b/lib/sisu/v5/html_concordance.rb
index b9030123..b9030123 100644
--- a/lib/sisu/v5/concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index 152de391..f57274ad 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -307,7 +307,7 @@ module SiSU
$process_document = :ok
unless @opt.act[:po4a][:set]==:on # --po4a, -P
if @opt.fno =~ /\.ssm$/
- require_relative 'composite' # composite.rb #pre-processing
+ require_relative 'ao_composite' # ao_composite.rb #pre-processing
SiSU_Assemble::Composite.new(@opt).read
end
require_relative 'ao' # -m ao.rb
@@ -357,7 +357,7 @@ module SiSU
end
end
if @opt.act[:concordance][:set]==:on #% --concordance, -w
- require_relative 'concordance' # concordance.rb
+ require_relative 'html_concordance' # html_concordance.rb
SiSU_Concordance::Source.new(@opt).read
end
if @opt.act[:epub][:set]==:on #% --epub, -e
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index 990600aa..0b11600a 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -65,7 +65,7 @@ module SiSU_Po4a
require_relative 'ao' # ao.rb
require_relative 'sysenv' # sysenv.rb
include SiSU_Env
- require_relative 'composite' # composite.rb
+ require_relative 'ao_composite' # ao_composite.rb
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'po4a_set' # po4a_set.rb
include SiSU_Param
diff --git a/lib/sisu/v5/remote.rb b/lib/sisu/v5/remote.rb
index e06e7b33..191b2edc 100644
--- a/lib/sisu/v5/remote.rb
+++ b/lib/sisu/v5/remote.rb
@@ -118,7 +118,7 @@ module SiSU_Remote
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('open-uri or pp NOT FOUND (LoadError)')
end
- require_relative 'composite' # composite.rb
+ require_relative 'ao_composite' # ao_composite.rb
@rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
threads=[]
for requested_page in @get_s
diff --git a/lib/sisu/v6/composite.rb b/lib/sisu/v6/ao_composite.rb
index 2afff1bf..f8c4b396 100644
--- a/lib/sisu/v6/composite.rb
+++ b/lib/sisu/v6/ao_composite.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/composite.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_composite.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/concordance.rb b/lib/sisu/v6/html_concordance.rb
index 5422056f..b94949b9 100644
--- a/lib/sisu/v6/concordance.rb
+++ b/lib/sisu/v6/html_concordance.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/concordance.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_concordance.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/v6/hub.rb
index 736fa8bc..bfe0cbe2 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/v6/hub.rb
@@ -307,7 +307,7 @@ module SiSU
$process_document = :ok
unless @opt.act[:po4a][:set]==:on # --po4a, -P
if @opt.fno =~ /\.ssm$/
- require_relative 'composite' # composite.rb #pre-processing
+ require_relative 'ao_composite' # ao_composite.rb #pre-processing
SiSU_Assemble::Composite.new(@opt).read
end
require_relative 'ao' # -m ao.rb
@@ -357,7 +357,7 @@ module SiSU
end
end
if @opt.act[:concordance][:set]==:on #% --concordance, -w
- require_relative 'concordance' # concordance.rb
+ require_relative 'html_concordance' # html_concordance.rb
SiSU_Concordance::Source.new(@opt).read
end
if @opt.act[:epub][:set]==:on #% --epub, -e
diff --git a/lib/sisu/v6/po4a.rb b/lib/sisu/v6/po4a.rb
index 3f890cec..66c68fce 100644
--- a/lib/sisu/v6/po4a.rb
+++ b/lib/sisu/v6/po4a.rb
@@ -65,7 +65,7 @@ module SiSU_Po4a
require_relative 'ao' # ao.rb
require_relative 'sysenv' # sysenv.rb
include SiSU_Env
- require_relative 'composite' # composite.rb
+ require_relative 'ao_composite' # ao_composite.rb
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'po4a_set' # po4a_set.rb
include SiSU_Param
diff --git a/lib/sisu/v6/remote.rb b/lib/sisu/v6/remote.rb
index ed5d7fba..37ff723f 100644
--- a/lib/sisu/v6/remote.rb
+++ b/lib/sisu/v6/remote.rb
@@ -118,7 +118,7 @@ module SiSU_Remote
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('open-uri or pp NOT FOUND (LoadError)')
end
- require_relative 'composite' # composite.rb
+ require_relative 'ao_composite' # ao_composite.rb
@rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
threads=[]
for requested_page in @get_s