Merge branch 'upstream' into debian/sid

20 files changed, 312 insertions, 231 deletions

diff --git a/CHANGELOG_v1 b/CHANGELOG_v1
index 0d9c3aef..4af76649 100644
--- a/CHANGELOG_v1
+++ b/CHANGELOG_v1
@@ -12,6 +12,8 @@ Reverse Chronological:
 
 %% Legacy Branch, Reference
 
+%% v1 branch removed from sisu 3.0 available in < sisu 2.8 (2.7 and below)
+
 %% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
   sisu_1.0.3.orig.tar.gz
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index e7c49a11..1e2b6829 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -13,23 +13,18 @@ Reverse Chronological:
 %% STABLE Branch
 
 %% 2.8.0.orig.tar.gz (2011-02-01:05/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.0.orig.tar.gz
   sisu_2.8.0.orig.tar.gz
   sisu_2.8.0-1.dsc
   sisu_2.8.0-1.diff.gz
 
+  [post Debian Squeeze]
+
   * opening of version 3 branch, see v3 changelog
 
   * closing of version 1 branch
 
-  [post Debian Squeeze]
-
-%% 2.7.10.orig.tar.gz (2010-12-16:50/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
-  sisu_2.7.10.orig.tar.gz
-  sisu_2.7.10-1.dsc
-  sisu_2.7.10-1.diff.gz
-
   * dal_syntax, (sisu syntax)
     * enforce use of curly braces in markup, remove single word markup without
       curly braces;
@@ -51,7 +46,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
 
 %% 2.7.9.orig.tar.gz (2010-12-09:49/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.9-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1b259aed7b454a576cf8d52acc48b8f524ef5612
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
   e4767c4e45f1b0a0d9dfcf1a077553143fd501926755b18e52a0e5d900366415 1196 sisu_2.7.9-1.dsc
@@ -96,7 +90,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
 
 %% 2.7.8.orig.tar.gz (2010-10-25:43/1)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.8-1
-http://git.sisudoc.org/?p=code/sisu.git;h=8bac1a749de5fc43b8be049532798d67ad2f97f0
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
   af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz
   fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc
@@ -143,7 +136,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
 
 %% 2.7.7.orig.tar.gz (2010-10-17:41/7)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.7-1
-http://git.sisudoc.org/?p=code/sisu.git;h=3425ce01fbb29e4c6f58b9dbeacdcdc3b430eb55
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
   0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz
   e8f3c1f8a546fa5ff58a1e14e6e4b9288b4ef1c549f018539bcc88a7f58f3c7f 1196 sisu_2.7.7-1.dsc
@@ -173,7 +165,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
 
 %% 2.7.6.orig.tar.gz (2010-10-11:41/1)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.6-1
-http://git.sisudoc.org/?p=code/sisu.git;h=0fe4c7cb80c986c31b4e8a17c57e8812db54861d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   7cd4c46fa3bcadd9bad5f009836e3f76ba33581f346c20baa750df849e132a4c 2746314 sisu_2.7.6.orig.tar.gz
   f9805002b99b9c7784a2e20a8f7ded02516f6a268e361785d7a15b0bd92c1360 1196 sisu_2.7.6-1.dsc
@@ -193,7 +184,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
 
 %% 2.7.5.orig.tar.gz (2010-10-09:40/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.5-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f3bf535de48ff8b5f236e975ce749c80db6ae046
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
   616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz
   79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc
@@ -212,7 +202,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
 
 %% 2.7.4.orig.tar.gz (2010-10-08:40/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.4-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1c84bbb8c41ff546ae007dd85f75a7a12023cdb9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
   3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz
   bc2193743fc8635a5974aa0e55507bf99264df0669d23e635cda11bff767ce3a 1196 sisu_2.7.4-1.dsc
@@ -229,7 +218,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
 
 %% 2.7.3.orig.tar.gz (2010-10-06:40/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.3-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=79ef5fd0725d0c92c18e73fa4a56b0a491d32544
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
   01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
   8c258e23ca20c57a39023a9a7cff228f3ba0581bc27bfa39d61706d6517aadc1 1196 sisu_2.7.3-1.dsc
@@ -254,7 +242,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
 
 %% 2.7.2.orig.tar.gz (2010-10-01:39/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.2-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f019e7fa052047b0335ec7e9fc6cd5e643f25dda
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz
   b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc
@@ -271,7 +258,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
 
 %% 2.7.1.orig.tar.gz (2010-10-01:39/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f0336c13da195245e1ef3f0f9d3cdb1137da2d01
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
   48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz
   620b4664f3c52e70821f6c23e0c215aaef0a75ea55bf1ca0bdb261b8747768d8 1196 sisu_2.7.1-1.dsc
@@ -302,7 +288,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
 
 %% 2.7.0.orig.tar.gz (2010-09-21:38/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a2218b6f96f9d840c5b2cfa25cd994be2f2a4069
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
   9e9e9695184e09dcf3fadee20e34d92d031c66419e49394de83a56cddd81bcba 2741663 sisu_2.7.0.orig.tar.gz
   c04567f96e711c86ac1a2bc47151314a051859c86c68ad5b11083f7b10989a25 1196 sisu_2.7.0-1.dsc
@@ -370,7 +355,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
 
 %% 2.6.3.orig.tar.gz (2010-07-28:30/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.3-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=44ccd0a8aaee13bbbd9628eee05520db6922bacf
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
   11194bce22da16b3d758afc4a5209d3503aa0b51235f7a0d2f6469e43e84f2f4 1196 sisu_2.6.3-1.dsc
@@ -454,7 +438,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   * options, add expressive options --[name] as alternative to flags -[x]
 
 (2010-09-20:38/1)
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=769442ea3e827937ed40a2aae7ec1bba7a0ce0ff
   a431d5a3b5285023fe09e4d7f885cabdb4eb540d9d6403f744bd65b0b91c09b5 1196 sisu_2.6.3-6.dsc
   3d9daf8718c9ffbd42a9492dc23d8c333e121687b84f9ac16333f6a813f60279 321360 sisu_2.6.3-6.diff.gz
   [debian freeze, documentation, minor fixes]
@@ -477,7 +460,6 @@ http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=769442ea3e827937ed40a2aae
 
 %% 2.6.2.orig.tar.gz (2010-07-15:28/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.2-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=b8de42c9a93f38ea0f1a542811d740da028d3c00
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
   63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
   e880807a7bddec2c574da599f1ea08b3564ed5fb8d3cd63a4e57dee0a22a7497 1151 sisu_2.6.2-1.dsc
@@ -506,7 +488,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
 
 %% 2.6.1.orig.tar.gz (2010-07-09:27/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4392e22ce84c432e9e2d79429e2319e0dfdcc882
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
   bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
@@ -526,7 +507,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
 
 %% 2.6.0.orig.tar.gz (2010-07-07:27/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4056a5a2480d3505d648869e6c6bfef101ab27f1
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
   c7a85d6960012a29f37fda02f3cf6a26276344a62f1b404660b9c8729c683187 1151 sisu_2.6.0-1.dsc
@@ -555,7 +535,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
 
 %% 2.5.1.orig.tar.gz (2010-06-12:23/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=80e3cbf97af98b094703efece3ca459577a19a21
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
   c87a04a3071de4e8388b214fb6bb1a602657c5859a817bd0f001c92a4ce1f98d 2768984 sisu_2.5.1.orig.tar.gz
   5698680779692893ba39666c6deebae8d796cf4b7b0a643853c49e6691f23f12 1145 sisu_2.5.1-1.dsc
@@ -566,7 +545,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
 
 %% 2.5.0.orig.tar.gz (2010-06-11:23/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f136873c61bf6239101df3a40e94550858a01813
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
   8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
   6c4c9a1737e6bd22b4d0a2a30419280f5bde67bc272bf9f2f2b8e59dc15d6c65 1145 sisu_2.5.0-1.dsc
@@ -591,7 +569,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
 
 %% 2.4.3.orig.tar.gz (2010-06-05:22/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.3-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=dd2989e951435bc617bbfc0647dcf24ee8dc8b57
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
   bf0e596113b60b873efc738ec2a9ab9a7b2d0687cd7011d27700331faab4e2c5 2767084 sisu_2.4.3.orig.tar.gz
   01784bc068f91858534f157a024d4ca723e4afb0161c50cf3a42ab0cbaeef889 1145 sisu_2.4.3-1.dsc
@@ -618,7 +595,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
 
 %% 2.4.2.orig.tar.gz (2010-06-01:22/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.2-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=35bd9574ae05e9f5db138522803ed7915ea46b45
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
   d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
   b9d161be07f01a42aa87ae4ca5a36309e99c52e6d76d092b0e15345674e23dad 1145 sisu_2.4.2-1.dsc
@@ -633,7 +609,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
 
 %% 2.4.1.orig.tar.gz (2010-05-26:21/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2bb04d2d78b4f5693737deb764ddfd33dc8d1982
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
   ee7ac449291c9aff05731fdefc1b31584f4ff6c0d3ec4b7b2250ef05c1d3b343 2765591 sisu_2.4.1.orig.tar.gz
   67e89b24d527361711543d503c0fc05c82dc7df845e31b28eba53b15522e520e 1145 sisu_2.4.1-1.dsc
@@ -648,7 +623,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
 
 %% 2.4.0.orig.tar.gz (2010-05-26:21/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=84e6d09e5706320eb63d7913ca4f94dfa7d0a95b
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
   5a7ca024e36d9d08653e2cfe335e83345305c16e531de361d84ba3315739303b 2764579 sisu_2.4.0.orig.tar.gz
   33097b5afccfff9cfea9b08acea55741482ae6f6eca5aa9d2fd8d90661708e83 1145 sisu_2.4.0-1.dsc
@@ -673,7 +647,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
 
 %% 2.3.5.orig.tar.gz (2010-05-18:20/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.5-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=16e4ef02a770d4c809bf0d654da71d6407699e20
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
   fb599fc29a6c1f67ae3ed6fe79ed2768045899870717d719d5b91be2a3db56fb 2755625 sisu_2.3.5.orig.tar.gz
   04e5430529ffdf77e6fbdd956b0eddaae1c00bd0640bad26c3a25c63bc2aac20 1145 sisu_2.3.5-1.dsc
@@ -689,7 +662,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
 
 %% 2.3.4.orig.tar.gz (2010-05-12:19/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.4-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=36e60044c9daa3b5f4b90b254cb2547254919d66
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
   3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
   c646cd4a08ad7e58c38b5bdcf0259574dd30db5db51a269be2a5bdf92b6a1293 1145 sisu_2.3.4-1.dsc
@@ -703,7 +675,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
 
 %% 2.3.3.orig.tar.gz (2010-05-05:18/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.3-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2ed17e169f26f27969f6f133ae4b562ef2f03d31
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
   89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
   c64f5d52720c666872bacadf1867b4aa01c04380a257df5dbf95a3f23ca0293b 1145 sisu_2.3.3-1.dsc
@@ -719,7 +690,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
 
 %% 2.3.2.orig.tar.gz (2010-05-03:18/1)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.2-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=c49812567cd574d9ccb870a6cdc4943038c8b97f
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
   5719841cbacf87088a9e34c868b6e2e9b0e9ac17221b4a02bddbe2a055b019c2 1145 sisu_2.3.2-1.dsc
@@ -749,7 +719,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
 
 %% 2.3.1.orig.tar.gz (2010-04-28:17/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=512fb10b2f3d3affdef7be8b072b0a0b9fc8e368
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
   03a9912a475a634e4e18024a508c64c67b60337cf0edeab01b96f3d54bc96e4a 2751600 sisu_2.3.1.orig.tar.gz
   475643cc77b3bef83cbeebdb8282240396805c328d2c6b48411555861d9d09e8 1145 sisu_2.3.1-1.dsc
@@ -759,7 +728,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
 
 %% 2.3.0.orig.tar.gz (2010-04-27:17/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=efb456ab2b61f2a5c5efeb42924ef1320d0b8891
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
   6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
   6423bf0b1d231bb766886fa23561fce565375c60902705ca0611ea6897b7de59 1145 sisu_2.3.0-1.dsc
@@ -808,7 +776,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
 
 %% 2.2.0.orig.tar.gz (2010-04-20:16/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.2.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4bc96b7b8ef87840125556c418be970cd84b9bf9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
   aa487605bc6bf89419c96773ed3738685307353ef4df1ead50d829785910747f 2746848 sisu_2.2.0.orig.tar.gz
   2709ec54dd49cc7796eff532b7d122d5383b2ca907ec39df4c87213de12bfb85 1145 sisu_2.2.0-1.dsc
@@ -848,7 +815,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
 
 %% 2.1.0.orig.tar.gz (2010-04-16:15/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.1.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=df791cb9ef04e558a54ef57a61ea7c81adb3417a
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   ceb7fb71ed815f7f64faac98174639f0008d4d7659053f6832cd3023f656a14b 2745619 sisu_2.1.0.orig.tar.gz
   a1a452dc0ff287a746a408862156afa054c51ae9efc232f8fa59a67d9af6b4b6 1145 sisu_2.1.0-1.dsc
@@ -882,7 +848,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
 
 %% 2.0.5.orig.tar.gz (2010-03-31:13/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.5-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=aba8f88aadbb8e08a3a2f875d8650363b14fc0d3
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
   8fad44b225512ab436562fc759244752b722c6d8aa4f3df3de3b1b97001fad43 2738182 sisu_2.0.5.orig.tar.gz
   e9fbc9b60f38067f1f3e7f1c89b20df39127ce322968df8390ed041289ecde7b 1145 sisu_2.0.5-1.dsc
@@ -900,7 +865,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
 
 %% 2.0.4.orig.tar.gz (2010-03-23:12/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.4-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e603e6c35e27537422e038de94fa7f7d7b3f1d2d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
   7fb8b578813fbd6cd4bf441e8eefeb9b52860064d1c66b83889bfc65468c90fd 2737242 sisu_2.0.4.orig.tar.gz
   262c08353f44e75f1f0da02ab4f7d5a843da687ddfd416ed4c2b7ad08f1226a7 1145 sisu_2.0.4-1.dsc
@@ -914,7 +878,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
 
 %% 2.0.3.orig.tar.gz (2010-03-22:12/1)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.3-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e5be411e7c179a4ab8636a120c71978c57fe55e9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
   5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
   4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc
@@ -928,7 +891,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
 
 %% 2.0.2.orig.tar.gz (2010-03-21:11/7)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.2-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1578133349a33a7e1e3fe39927bcfe50fffd86e4
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
   c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
   721ff54e991ede11da9c584530e4ec4b37f2e6f60e50d04a6c87a974c3e10a62 1145 sisu_2.0.2-1.dsc
@@ -944,7 +906,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
 
 %% 2.0.1.orig.tar.gz (2010-03-17:11/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.1-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=59653d4445a43d00efcad161bdeeae6cb3c874cc
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
   364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz
   7b6eb6a962b3120f0e0820fecae7ef0ceadd4ef510719727b63e70f7ae2a323c 1145 sisu_2.0.1-1.dsc
@@ -962,7 +923,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
 
 %% 2.0.0.orig.tar.gz (2010-03-06:09/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.0-1
-http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a1838881e7874b8eb857c81ce53a755985265e04
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
   4fc214d40542e0d2ba7447e9ff06de3612d857d9015e8233877f9b4f93a9875f 2733550 sisu_2.0.0.orig.tar.gz
   6a157cbfc838f8141b352ab1513ac67bb43802db22f62902275df48ba41c5a0f 1145 sisu_2.0.0-1.dsc
diff --git a/CHANGELOG_v3 b/CHANGELOG_v3
index be7fe541..66b57694 100644
--- a/CHANGELOG_v3
+++ b/CHANGELOG_v3
@@ -13,11 +13,28 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.1.orig.tar.gz (2011-02-16:07/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
+  sisu_3.0.1.orig.tar.gz
+  sisu_3.0.1-1.dsc
+  sisu_3.0.1-1.debian.tar.gz
+
+  * sysenv, sisurc.yml and elsewhere as affected, output_dir_structure:
+    by_language_code; by_filetype; by_filename
+
+  * css, fix css paths for xhtml, xml dom & xml sax
+
+  * console feedback on selected files being processed, updates & fixes
+
+  * sysenv & sisurc.yml: libreoffice, default odf reader
+
 %% 3.0.0.orig.tar.gz (2011-02-07:06/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
-  sisu_3.0.0.orig.tar.gz
-  sisu_3.0.0-1.dsc
-  sisu_3.0.0-1.diff.gz
+  53b9629bde5d27c504005ebc02c722d5d7d6cc3556e9dbfd1802dac682c52856 2716588 sisu_3.0.0.orig.tar.gz
+  7cd26f5d70bb5bfac33d74dc69eb0d00bf5d3864612c984f5db3e1c2058635cb 1222 sisu_3.0.0-1.dsc
+  3a319dc5863742c3b2e461b19802b284dfdb51240771d7f9517d1761a2912d06 279707 sisu_3.0.0-1.debian.tar.gz
 
   NOTE: Processing defaults to v2, for v3 use 'sisu3' or 'sisu --v3'
 
@@ -77,9 +94,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
             ├── rnc
             ├── rng
             └── xsd
-    [FIX todo: 
-     * post rsync, 
-     * output url paths, 
+    [FIX todo:
+     * post rsync,
+     * output url paths,
      * also processing of url,
      * processing of sisupod,
      * search db?,
diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v3/sisurc.yml
index dea3f653..f250b71d 100644
--- a/conf/sisu/v3/sisurc.yml
+++ b/conf/sisu/v3/sisurc.yml
@@ -94,16 +94,21 @@ default:
 #  ocn:               true
 #plaintext:
 #  ocn:               true
-#% output_strucure: by_language: and/or by_filetype: (else default "bundled"
-#output) possible values ~, true, false, (default where not set, false),
-#output_structure: by_language: (language code directories with filetype
-#subdirectories); by_filetype: (filetype directories output_structure) the
-#previous default was by_language: false by_filetype: false. Note that where
-#by_language is true, by_filetype is (forced) true. If e.g. using po4a
-#by_langauge should be used and set true:
-output_structure:
-  by_language:        true
-  by_filetype:        true
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: language
+
+##% output_strucure: by_language: and/or by_filetype: (else default "bundled"
+##output) possible values ~, true, false, (default where not set, false),
+##output_structure: by_language: (language code directories with filetype
+##subdirectories); by_filetype: (filetype directories output_structure) the
+##previous default was by_language: false by_filetype: false. Note that where
+##by_language is true, by_filetype is (forced) true. If e.g. using po4a
+##by_langauge should be used and set true:
+#output_structure:
+#  by_language:        true
+#  by_filetype:        true
+
 #% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c
 #:R -c :S'.  will only ignore if value set to false, absence or nil will not
 #remove program as should operate without rc file ie in case of ~ will ignore
@@ -130,7 +135,7 @@ program_set:
 #  web_browser:  'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
 #  console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
 #  epub_viewer:  'ebook-viewer' #'calibre' #'okular' #'fbreader'
-#  odf_viewer:   'oowriter' #'abiword'
+#  odf_viewer:   'libreoffice' #'oowriter' #'abiword'
 #  xml_viewer:   'xml-viewer'
 #  man:          'nroff -man' #'groff -man -Tascii' # 'nroff -man'
 #promo:              sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
diff --git a/data/doc/sisu/v3/CHANGELOG b/data/doc/sisu/v3/CHANGELOG
index 8209e433..57ff8869 100644
--- a/data/doc/sisu/v3/CHANGELOG
+++ b/data/doc/sisu/v3/CHANGELOG
@@ -13,11 +13,26 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.1.orig.tar.gz (2011-02-15:07/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
+  sisu_3.0.1.orig.tar.gz
+  sisu_3.0.1-1.dsc
+  sisu_3.0.1-1.debian.tar.gz
+
+  * sysenv, sisurc.yml and elsewhere as affected, output_dir_structure:
+    by_language_code; by_filetype; by_filename
+
+  * css, fix css paths for xhtml, xml dom & xml sax
+
+  * console feedback on selected files being processed, updates & fixes
+
+  * sysenv & sisurc.yml: libreoffice, default odf reader
+
 %% 3.0.0.orig.tar.gz (2011-02-07:06/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
-  sisu_3.0.0.orig.tar.gz
-  sisu_3.0.0-1.dsc
-  sisu_3.0.0-1.diff.gz
+  53b9629bde5d27c504005ebc02c722d5d7d6cc3556e9dbfd1802dac682c52856 2716588 sisu_3.0.0.orig.tar.gz
+  7cd26f5d70bb5bfac33d74dc69eb0d00bf5d3864612c984f5db3e1c2058635cb 1222 sisu_3.0.0-1.dsc
+  3a319dc5863742c3b2e461b19802b284dfdb51240771d7f9517d1761a2912d06 279707 sisu_3.0.0-1.debian.tar.gz
 
   NOTE: Processing defaults to v2, for v3 use 'sisu3' or 'sisu --v3'
 
@@ -77,9 +92,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
             ├── rnc
             ├── rng
             └── xsd
-    [FIX todo: 
-     * post rsync, 
-     * output url paths, 
+    [FIX todo:
+     * post rsync,
+     * output url paths,
      * also processing of url,
      * processing of sisupod,
      * search db?,
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 4fd83868..267c5316 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.0-beta
-:date_stamp: 2011w06/1
-:date: "2011-02-07"
+:version: 3.0.1-beta
+:date_stamp: 2011w07/3
+:date: "2011-02-16"
 :project: SiSU
diff --git a/lib/sisu/v3/digests.rb b/lib/sisu/v3/digests.rb
index 38b79ae1..26e91528 100644
--- a/lib/sisu/v3/digests.rb
+++ b/lib/sisu/v3/digests.rb
@@ -76,12 +76,12 @@ module SiSU_Digest_view
         @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
         unless @opt.cmd =~/q/
           tool=(@opt.cmd =~/[MVv]/) \
-          ? "#{@env.program.text_editor} #{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}" \
+          ? "#{@env.program.text_editor} file://#{@md.file.output_path.hash_digest}/#{@md.file.base_filename.hash_digest}" \
           : @opt.fns
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.hash_digest}/#{@md.file.base_filename.hash_digest}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_Digest_view::Source::Scroll.new(@particulars).songsheet
         SiSU_Env::Info_skin.new(@md).select
diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb
index 0da90712..22c42980 100644
--- a/lib/sisu/v3/epub.rb
+++ b/lib/sisu/v3/epub.rb
@@ -85,14 +85,13 @@ module SiSU_EPUB
         @env=@particulars.env
         loc=@env.path.url.output_tell
         unless @opt.cmd =~/q/
-          tool=if @opt.cmd =~/z/;   "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub"
-          elsif @opt.cmd =~/[MVv]/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub"
+          tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.epub_viewer} #{@md.file.output_path.epub}/#{@md.file.base_filename.epub}"
           else                      @opt.fns
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{loc}/epub/#{@fnb}.epub").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.epub}/#{@md.file.base_filename.epub}").flow if @opt.cmd =~/[MV]/
         end
         @env.path.epub_bld #(@md)
         @env.path.epub_cp_images(@md)
diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v3/git.rb
index 00cd1e67..b14645c9 100644
--- a/lib/sisu/v3/git.rb
+++ b/lib/sisu/v3/git.rb
@@ -71,7 +71,7 @@ module SiSU_Git
       unless @md.i18n[0]==l[:c]
         p "using: #{@md.i18n[0]} (@make: :language:); filename #{@md.fns} filename language: #{l[:c]}, mismatch"
       end
-      if @env.multilingual?
+      if @env.output_dir_structure.multilingual?
         m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss
         fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3]
       else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/
diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb
index ade1a801..bad68cde 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v3/html.rb
@@ -87,14 +87,13 @@ module SiSU_HTML
         @env=@particulars.env
         loc=@env.url.output_tell
         unless @opt.cmd =~/q/
-          tool=if @opt.cmd =~/z/;   "#{@env.program.web_browser} #{loc}/#{@fnb}/#{@md.fn[:index]}"
-          elsif @opt.cmd =~/[MVv]/; "#{@env.program.web_browser} #{loc}/#{@fnb}/#{@md.fn[:index]}"
-          else                      @opt.fns
+          tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.web_browser} file://#{@md.file.output_path.html_seg}/#{@md.file.base_filename.html_segtoc}"
+          else                          @opt.fns
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@fnb}/#{@md.fn[:index]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.html_seg}/#{@md.file.base_filename.html_segtoc}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_Env::Info_skin.new(@md).select
         data=nil
@@ -422,8 +421,8 @@ WOK
         p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn) if ocn
         @file=SiSU_Env::SiSU_file.new(@md) if @md
         txt_obj=if seg_link=~/sisu_manifest\.html/
-          man_link=if @file.by_language? \
-          or @file.by_filetype?
+          man_link=if @file.output_dir_structure.by_language_code? \
+          or @file.output_dir_structure.by_filetype?
             seg_link.gsub(/sisu_manifest\.html/,"../../manifest/#{@file.base_filename.manifest}")
           else seg_link
           end
diff --git a/lib/sisu/v3/html_format.rb b/lib/sisu/v3/html_format.rb
index 15345ca0..76805234 100644
--- a/lib/sisu/v3/html_format.rb
+++ b/lib/sisu/v3/html_format.rb
@@ -187,8 +187,8 @@ module SiSU_HTML_Format
       env.widget.search_form('sisusearch',nil,nil,true)
     end
     def manifest
-      manifest_lnk=if @file.by_language? \
-      or @file.by_filetype?
+      manifest_lnk=if @file.output_dir_structure.by_language_code? \
+      or @file.output_dir_structure.by_filetype?
         "#{Xx[:html_relative1]}manifest/#{@file.base_filename.manifest}"
       else @file.base_filename.manifest
       end
@@ -651,8 +651,8 @@ WOK
       nxt="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
       if nxt=~/sisu_manifest\.html/
         @file=SiSU_Env::SiSU_file.new(@md) if @md
-        if @file.by_language? \
-        or @file.by_filetype?
+        if @file.output_dir_structure.by_language_code? \
+        or @file.output_dir_structure.by_filetype?
           nxt.gsub!(/sisu_manifest\.html/,"../../manifest/#{@file.base_filename.manifest}")
         end
       end
@@ -713,8 +713,8 @@ WOK
 </td>} if f_nxt==true
       if nxt =~/sisu_manifest.html/
         @file=SiSU_Env::SiSU_file.new(@md) if @md
-        if @file.by_language? \
-        or @file.by_filetype?
+        if @file.output_dir_structure.by_language_code? \
+        or @file.output_dir_structure.by_filetype?
           nxt.gsub!(/sisu_manifest\.html/,"../../manifest/#{@file.base_filename.manifest}")
         end
       end
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb
index c9fb8e04..58b78c76 100644
--- a/lib/sisu/v3/manifest.rb
+++ b/lib/sisu/v3/manifest.rb
@@ -82,9 +82,9 @@ module SiSU_Manifest
         SiSU_Env::Info_skin.new(@md).select
         xbrowser=@env.program.web_browser
         browser=@env.program.console_web_browser
-        webserv_url=@env.path.url.output_tell
+#       webserv_url=@env.path.url.output_tell #fix in sysenv
         unless @opt.cmd =~/q/
-          url_html="#{webserv_url}/#{@md.fnb}/#{@md.fn[:manifest]}"
+          url_html="file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi
@@ -646,8 +646,8 @@ SiSU manifest: #{@md.title.full}
 #{banner_table}
 WOK
           if @env.manifest_minitoc?
-            if @env.by_language? \
-            or @env.by_filetype?
+            if @env.output_dir_structure.by_language_code? \
+            or @env.output_dir_structure.by_filetype?
               minitoc.gsub!(/<a href="(\S+?)"/m,%{<a href="../html/#{@md.fnb}/\\1"})
               minitoc.gsub!(/<a href="\.\.\/html\/#{@md.fnb}\/(?:sisu_manifest\.html|#{@md.file.base_filename.manifest})"/m,
               %{<a href="#{@md.file.base_filename.manifest}"})
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb
index 8a1c5322..ce696fdd 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v3/odf.rb
@@ -86,12 +86,12 @@ module SiSU_ODF
         path=@env.path.output_tell
         unless @opt.cmd =~/q/
           tool=(@opt.cmd =~/[MVv]/) \
-          ? "#{@env.program.odf_viewer} #{path}/#{@md.fnb}/#{opendoc}" \
+          ? "#{@env.program.odf_viewer} file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}" \
           : @opt.fns
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{opendoc}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_ODF::Source::Scroll.new(@particulars).songsheet
         SiSU_Env::Info_skin.new(@md).select
diff --git a/lib/sisu/v3/plaintext.rb b/lib/sisu/v3/plaintext.rb
index 004705f3..8b910642 100644
--- a/lib/sisu/v3/plaintext.rb
+++ b/lib/sisu/v3/plaintext.rb
@@ -84,12 +84,12 @@ module SiSU_Plaintext
         unless @opt.cmd =~/q/
           path=env.path.output_tell
           tool=(@opt.cmd =~/[MVv]/) \
-          ? "#{env.program.text_editor} #{path}/#{md.fnb}/#{md.fn[:plain]}" \
+          ? "#{env.program.text_editor} #{md.file.output_path.txt}/#{md.file.base_filename.txt}" \
           : @opt.fns
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{path}/#{md.fnb}/#{md.fn[:plain]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{md.file.output_path.txt}/#{md.file.base_filename.txt}").flow if @opt.cmd =~/[MV]/
         end
         dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
         wrap_width=if defined? md.make.plaintext_wrap \
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 00e3f030..a7105d69 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -399,30 +399,56 @@ module SiSU_Env
       end
       @fnn,@fnb,@fnt,@flv,@fnz=@@fnn,@@fnb,@@fnt,@@flv,@@fnz
     end
-    def by_language?
-      x=(defined? @rc['output_structure']['by_language'] \
-      && @rc['output_structure']['by_language'] ==true) \
-      ? @rc['output_structure']['by_language'] \
-      : false
-    end
-    def by_filetype?
-      x=if by_language?
-        true
-      else
-        x=(defined? @rc['output_structure']['by_filetype'] \
-        && @rc['output_structure']['by_filetype'] ==true) \
-        ? @rc['output_structure']['by_filetype'] \
-        : false
+    def output_dir_structure
+      def by_language_code?
+        x=if defined? @rc['output_dir_structure_by'] \
+        and @rc['output_dir_structure_by'] =~/language/
+          true
+        else defined? @rc['output_structure']['by_language']
+          (defined? @rc['output_structure']['by_language'] \
+          && @rc['output_structure']['by_language'] ==true) \
+          ? true \
+          : false
+        end
       end
-    end
-    def multilingual?
-      by_language?
+      def by_filetype?
+        x=if by_language_code?
+          false
+        elsif defined? @rc['output_dir_structure_by'] \
+        and @rc['output_dir_structure_by'] =~/filetype/
+          true
+        else
+          x=(defined? @rc['output_structure']['by_filetype'] \
+          && @rc['output_structure']['by_filetype'] ==true) \
+          ? true \
+          : false
+        end
+      end
+      def by_filename?
+        x=if by_language_code?
+          false
+        elsif by_filetype?
+          false
+        elsif defined? @rc['output_dir_structure_by'] \
+        and @rc['output_dir_structure_by'] =~/filename/
+          true
+        elsif defined? @rc['output_structure']['by_filename'] \
+        and @rc['output_structure']['by_filename'] ==true
+          true
+        else
+          true
+        end
+      end
+      def multilingual?
+        by_language_code?
+      end
+      self
     end
     def document_language_versions_found
       @fn={}
       unless (@fns.nil? \
       or @fns.empty?)
-        if multilingual?
+        if output_dir_structure.by_language_code?
           m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst$)/
           @fn[:b],@fn[:m],@fn[:t]=@fns[m,1],@fns[m,2],@fns[m,3]
         else m=/(.+?)\.((?:-|ssm\.)?sst$)/
@@ -453,7 +479,7 @@ module SiSU_Env
       @m=[]
       unless (@fns.nil? \
       or @fns.empty?)
-        if multilingual?
+        if output_dir_structure.by_language_code?
           m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst$)/
           @fn[:b],@fn[:m],@fn[:t]=@fns[m,1],@fns[m,2],@fns[m,3]
         else m=/(.+?)\.((?:-|ssm\.)?sst$)/
@@ -1909,7 +1935,7 @@ WOK
         else %{(SiSU (generated sample) search form}
         end
       end
-      def output_tell
+      def output_tell                                      #BROKEN Revisit 2011-02
         output_type=if defined? @rc['show_output_on'] \
         and @rc['show_output_on'] =~/^(?:filesystem|webserv|(?:local|remote)(?:_webserv)?|webrick)/
           @rc['show_output_on']
@@ -2068,7 +2094,7 @@ WOK
         ((defined? @rc['program_select']['odf_viewer']) \
         && @rc['program_select']['odf_viewer'] =~/\S\S+/) \
         ? @rc['program_select']['odf_viewer'] \
-        : 'oowriter'                                                          #'odf-viewer','oowriter'
+        : 'libreoffice'                                                        #'odf-viewer','oowriter'
       end
       def manpage_viewer
         'man'
@@ -2136,7 +2162,7 @@ WOK
       #end
       def lang_filename(l)
         @lang={}
-        x=if multilingual?
+        x=if output_dir_structure.by_language_code?
           (( defined? @rc['default']['language_file']) \
           && @rc['default']['language_file'] != nil) \
           ? @rc['default']['language_file'] \
@@ -2270,7 +2296,7 @@ WOK
       ft=[]
       if @md \
       and defined? @md.fn \
-      and @md.fn        # used for multilingual?
+      and @md.fn        # used for by_language_code?
         if @md.cmd =~ /[hH]/
           ft << @md.fn[:html]
         end
@@ -2850,63 +2876,72 @@ WOK
     end
     def path_rel_links
       def html_scroll_2
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../'
         else
           '../'
         end
       end
       def html_seg_2
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../../../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../../'
         else
           '../../'
         end
       end
       def html_scroll_1
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../'
         else
           '/'
         end
       end
       def html_seg_1
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../../'
         else
           '/'
         end
       end
-      def html_scroll_css
-        if @env.multilingual?
+      def default_output_css
+        if @env.output_dir_structure.by_language_code?
           '../../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../'
         else
           '../'
         end
       end
+      def html_scroll_css
+        default_output_css
+      end
+      def xhtml_css
+        default_output_css
+      end
+      def xml_css
+        default_output_css
+      end
       def html_seg_css
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../../../'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           '../../'
         else
           '../'
         end
       end
       def manifest_css
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           '../../_sisu/css'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           ''
         else
           '../'
@@ -2935,14 +2970,21 @@ WOK
       ensure
       end
     end
-    def by_language?
-      @env.by_language?
-    end
-    def by_filetype?
-      @env.by_filetype?
-    end
-    def multilingual?
-      by_language?
+    def output_dir_structure
+      def by_language_code?
+        @env.output_dir_structure.by_language_code?
+      end
+      def by_filetype?
+        @env.output_dir_structure.by_filetype?
+      end
+      def by_filename?
+        @env.output_dir_structure.by_filename?
+      end
+      def multilingual?
+        @env.output_dir_structure.by_language_code?
+        #by_language_code?
+      end
+      self
     end
     def mkdir_initialize                                                       # not used but consider using
       mkdir_p(output_path.base) unless FileTest.directory?(output_path.base)
@@ -3122,9 +3164,9 @@ WOK
     end
     def base_filename
       def txt
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.txt'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + @md.fn[:plain]
         else
           'plain' + @md.fn[:plain]
@@ -3132,9 +3174,9 @@ WOK
       end
       def html_scroll
         #"#{@md.fnl[:pre]}scroll#{@md.fnl[:mid]}.html#{@md.fnl[:post]}"
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.html'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + @md.fn[:html]
         else
           'scroll' + @md.fn[:html]
@@ -3142,7 +3184,7 @@ WOK
       end
       def html_seg_index
         #"#{@md.fnl[:pre]}index#{@md.fnl[:mid]}.html#{@md.fnl[:post]}"
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           'toc.html'
         else
           'index' + @md.fn[:html]
@@ -3150,37 +3192,37 @@ WOK
       end
       def html_segtoc
         #"#{@md.fnl[:pre]}toc#{@md.fnl[:mid]}.html#{@md.fnl[:post]}"
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           'toc.html'
         else
           'toc' + @md.fn[:html]
         end
       end
       def html_book_index
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           'book_index.html'
         else
           'book_index.' + @md.fn[:html]
         end
       end
       def html_concordance
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           'concordance.html'
         else
           'concordance' + @md.fn[:html]
         end
       end
       def xhtml
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.xhtml'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:xhtml]
         else
           'scroll.' + @md.fn[:xhtml]
         end
       end
       def epub
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.epub'
         else
           @md.fnb + @md.fn[:epub]
@@ -3188,42 +3230,42 @@ WOK
       end
       def odt
         #"#{@md.fnl[:pre]}#{@md.fnb}#{@md.fnl[:mid]}.odt#{@md.fnl[:post]}"
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.odt'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + @md.fn[:odf]
         else
           'opendocument' + @md.fn[:odf]
         end
       end
       def xml_sax
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.sax.xml'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:sax]
         else
           'scroll.' + @md.fn[:sax]
         end
       end
       def xml_dom
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.dom.xml'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:dom]
         else
           'scroll.' + @md.fn[:dom]
         end
       end
       def pdf_p
-        if @env.multilingual? \
-        or @env.by_filetype?
+        if @env.output_dir_structure.by_language_code? \
+        or @env.output_dir_structure.by_filetype?
           @md.fnb + '.portrait.'
         else 'portrait.'
         end
       end
       def pdf_l
-        if @env.multilingual? \
-        or @env.by_filetype?
+        if @env.output_dir_structure.by_language_code? \
+        or @env.output_dir_structure.by_filetype?
           @md.fnb + '.landscape.'
         else 'landscape.'
         end
@@ -3259,34 +3301,34 @@ WOK
         pdf_l + @md.fn[:pdf_l_legal]
       end
       def manpage
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.1'
         else
           @md.fnb + '.' + @md.fn[:manpage]
         end
       end
       def hash_digest
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.hash_digest.txt'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:digest]
         else
           'digest.' + @md.fn[:digest]
         end
       end
       def sitemap
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.sitemap.xml'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:sitemap]
         else
           'sitemap.' + @md.fn[:sitemap]
         end
       end
       def manifest
-        if @env.multilingual?
+        if @env.output_dir_structure.by_language_code?
           @md.fnb + '.manifest.html'
-        elsif @env.by_filetype?
+        elsif @env.output_dir_structure.by_filetype?
           @md.fnb + '.' + @md.fn[:manifest]
         else
           'sisu_' + @md.fn[:manifest]
@@ -3319,23 +3361,23 @@ WOK
       : @md.i18n[0]
     end
     def set_path_abc(ft)
-      if @env.multilingual?
+      if @env.output_dir_structure.by_language_code?
         "#{output_path.base}/#{lang_part}/#{ft}"
-      elsif @env.by_filetype?
+      elsif @env.output_dir_structure.by_filetype?
         "#{output_path.base}/#{ft}"
       else
         "#{output_path.base}/#{@md.fnb}"
       end
     end
     def set_path_ab(ft)
-      if @env.multilingual?
+      if @env.output_dir_structure.by_language_code?
         "#{output_path.base}/#{lang_part}/#{ft}"
       else
         "#{output_path.base}/#{ft}"
       end
     end
     def set_path_ab_src(ft)
-      if @env.multilingual?
+      if @env.output_dir_structure.by_language_code?
         "#{output_path.base}/#{ft}/#{lang_part}"
       else
         "#{output_path.base}/#{ft}"
@@ -3844,6 +3886,18 @@ WOK
     def xhtml_epub
       %{  <link rel="stylesheet" href="css/xhtml.css" type="text/css" />}
     end
+    def epub
+      xhtml_epub
+    end
+    def xhtml
+      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xhtml_css}#{@env.path.style}/#{@css.xhtml}"?>}
+    end
+    def xml_sax
+      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_sax}"?>}
+    end
+    def xml_dom
+      %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_dom}"?>}
+    end
   end
   class Create_site < Info_env
     require "#{SiSU_lib}/css"                              # css.rb
diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb
index 8b0ba8c6..e0646603 100644
--- a/lib/sisu/v3/texpdf.rb
+++ b/lib/sisu/v3/texpdf.rb
@@ -106,13 +106,13 @@ module SiSU_TeX
         SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',@md.fns).green_title_hi unless @opt.cmd =~/q/
         if @opt.cmd =~/[MVv]/
           path=@env.url.output_tell
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_l]}").flow
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_p]}").flow
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l}pdf").flow
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p}pdf").flow
         end
         @md=@particulars.md
-        $flag=@md.cmd                                                         #introduced to pass 0 for no object citation numbers... to texpdf_format
+        $flag=@md.cmd                                                          #introduced to pass 0 for no object citation numbers... to texpdf_format
         directories
-                                                                             #% needed needs to be reprogrammed !!!
+                                                                               #% needed needs to be reprogrammed !!!
         SiSU_Env::Info_skin.new(@md).select
         dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
         SiSU_TeX::Source::LaTeX_create.new(@particulars).songsheet
@@ -231,8 +231,8 @@ module SiSU_TeX
             else           pdf_p=@md.file.base_filename.pdf_p_a4;     pdf_l=@md.file.base_filename.pdf_l_a4
             end
             if FileTest.file?("#{@md.file.output_path.pdf}/#{pdf_p}")
-              mklnk=if @md.file.by_language? \
-              or @md.file.by_filetype?
+              mklnk=if @md.file.output_dir_structure.by_language_code? \
+              or @md.file.output_dir_structure.by_filetype?
                 "#{@md.fnb}.portrait.pdf"
               else 'portrait.pdf'
               end
@@ -243,8 +243,8 @@ module SiSU_TeX
               ")
             end
             if FileTest.file?("#{@md.file.output_path.pdf}/#{pdf_l}")
-              mklnk=if @md.file.by_language? \
-              or @md.file.by_filetype?
+              mklnk=if @md.file.output_dir_structure.by_language_code? \
+              or @md.file.output_dir_structure.by_filetype?
                 "#{@md.fnb}.landscape.pdf"
               else 'landscape.pdf'
               end
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb
index c2b694a2..5cc69e7b 100644
--- a/lib/sisu/v3/urls.rb
+++ b/lib/sisu/v3/urls.rb
@@ -192,54 +192,54 @@ module SiSU_urls
         @u.each do |x,y|
           if @opt.fns =~ @m_regular
             if @opt.cmd =~/[MVv]/
-              if x=~/^([bcNwxXY])/ \
-              and @opt.cmd=~/[bcNwxXY]/ \
-              and x=~/^[#{@opt.cmd}]/
-                m=$1
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/#{@fnb}/#{y}").result
+              if (x=~/^a/ and @opt.cmd =~/a/) \
+              or (x=~/^t/ and @opt.cmd =~/t/)
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.txt}/#{@md.file.base_filename.txt}").result
               end
-              if x=~/^[y]/ \
-              and @opt.cmd =~/[y]/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}").result
+              if x=~/^b/ \
+              and @opt.cmd =~/b/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xhtml}/#{@md.file.base_filename.xhtml}").result
               end
-              if x=~/^[at]/ \
-              and @opt.cmd =~/[at]/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.txt}/#{@md.file.base_filename.txt}").result
+#              if x=~/^[c]/ \
+#              and @opt.cmd =~/[c]/
+#                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}").result
+#              end
+              if x=~/^D/ \
+              and @opt.cmd =~/D/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result
               end
-              if x=~/^h/ \
-              and @opt.cmd =~/h/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_scroll}/#{@md.file.base_filename.html_scroll}").result
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_seg}/#{@md.file.base_filename.html_segtoc}").result
+              if x=~/^d/ \
+              and @opt.cmd =~/d/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result
               end
               if x=~/^e/ \
               and @opt.cmd =~/e/
                 SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.epub_viewer} #{@md.file.output_path.epub}/#{@md.file.base_filename.epub}").result
               end
-              if x=~/^o/ \
-              and @opt.cmd =~/o/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}").result
-              end
-              if x=~/^p/ \
-              and @opt.cmd =~/p/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p}pdf").result
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l}pdf").result
+              if x=~/^h/ \
+              and @opt.cmd =~/h/
+                if x =~/scroll/
+                  SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_scroll}/#{@md.file.base_filename.html_scroll}").result
+                else
+                  SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_seg}/#{@md.file.base_filename.html_segtoc}").result
+                end
               end
               if x=~/^I/ \
               and @opt.cmd =~/I/
                 SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","cd #{@env.path.texinfo}; pinfo ./#{@fnb}.#{y}; cd -").result
               end
-              if x=~/^D/ \
-              and @opt.cmd =~/D/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result
-              end
-              if x=~/^d/ \
-              and @opt.cmd =~/d/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result
-              end
               if x=~/^i/ \
               and @opt.cmd =~/i/
                 SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.path.manpage}/#{@fnb}.1").result
               end
+              if x=~/^N/ \
+              and @opt.cmd =~/N/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.hash_digest}/#{@md.file.base_filename.hash_digest}").result
+              end
+              if x=~/^o/ \
+              and @opt.cmd =~/o/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}").result
+              end
               if x=~/^P/ \
               and @opt.cmd =~/P/
                 if @opt.fns =~/\S+?~\S{2}(?:_\S{2})?\.ss[mt]/
@@ -250,15 +250,19 @@ module SiSU_urls
                 end
                 #@opt.cmd.gsub!(/P/,'')
               end
+              if x=~/^p/ \
+              and @opt.cmd =~/p/
+                if x =~/portrait/
+                  SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p}pdf").result
+                else
+                  SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l}pdf").result
+                end
+              end
               #if x=~/^P/ \
               #and @opt.cmd =~/P/
               #  SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} Profile","#{@pwd_stub}::#{@opt.fns}",y).result
               #  @opt.cmd.gsub!(/P/,'')
               #end
-              if x=~/^s/ \
-              and @opt.cmd =~/s/
-                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@md.file.output_path.src}/#{y}").result
-              end
               if x=~/^S/ \
               and @opt.cmd =~/S/
                 zipfile=if @opt.fns =~/\.ssm\.sst$/; y.gsub(/(?:\~\S{2,3})?(\.ssm\.sst\.zip)$/,'.ssm.zip')
@@ -266,6 +270,31 @@ module SiSU_urls
                 end
                 SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/pod/#{y}").result
               end
+              if x=~/^s/ \
+              and @opt.cmd =~/s/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@md.file.output_path.src}/#{y}").result
+              end
+              if x=~/^w/ \
+              and @opt.cmd =~/w/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_concordance}/#{@md.file.base_filename.html_concordance}").result
+              end
+              if x=~/^X/ \
+              and @opt.cmd =~/X/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_dom}/#{@md.file.base_filename.xml_dom}").result
+              end
+              if x=~/^x/ \
+              and @opt.cmd =~/x/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_sax}/#{@md.file.base_filename.xml_sax}").result
+              end
+              if x=~/^Y/ \
+              and @opt.cmd =~/Y/ #BROKEN
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.sitemap}/#{@md.file.base_filename.sitemap}").result
+              end
+
+              if x=~/^y/ \
+              and @opt.cmd =~/y/
+                SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}").result
+              end
             end
             urls_maintenance(@opt,x,y) if @opt.cmd =~/[MV]/
           end
diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v3/xhtml.rb
index 94243c48..b1855653 100644
--- a/lib/sisu/v3/xhtml.rb
+++ b/lib/sisu/v3/xhtml.rb
@@ -83,14 +83,15 @@ module SiSU_XHTML
         unless @opt.cmd =~/q/
           path=@env.path.output_tell
           loc=@env.url.output_tell
-          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
-          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}"
+
+          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xhtml}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
+          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml}/#{@md.file.base_filename.xhtml}"
           else @opt.fns
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize \
           : SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"/#{@md.file.output_path.xhtml}/#{@md.file.base_filename.xhtml}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_XHTML::Source::Songsheet.new(@particulars).song
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
@@ -352,11 +353,11 @@ WOK
         rdf=SiSU_XML_tags::RDF.new(@md)
         dir=SiSU_Env::Info_env.new
         @@xml[:head],@@xml[:body]=[],[]
-        css=SiSU_Env::CSS_select.new(@md).xhtml
+        css=SiSU_Env::CSS_stylesheet.new(@md)
         encoding=(@sys.locale =~/utf-?8/i) ? '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' : '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
         @@xml[:open] =<<WOK
 #{encoding}
-<?xml-stylesheet type="text/css" href="../#{@env.path.style}/#{css}"?>
+#{css.xhtml}
 #{rdf.comment_xml}
 <document>
 WOK
diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v3/xml.rb
index f0e62de9..a3767177 100644
--- a/lib/sisu/v3/xml.rb
+++ b/lib/sisu/v3/xml.rb
@@ -83,14 +83,14 @@ module SiSU_XML_SAX
         unless @opt.cmd =~/q/
           path=@env.path.output_tell
           loc=@env.url.output_tell
-          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:sax]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:sax]}"
-          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:sax]}"
+          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax}/#{@md.file.base_filename.xml_sax}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_sax}/#{@md.file.base_filename.xml_sax}"
+          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax}/#{@md.file.base_filename.xml_sax}"
           else @opt.fns
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize \
           : SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{path}/#{@md.fnb}/#{@md.fn[:sax]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_sax}/#{@md.file.base_filename.xml_sax}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_XML_SAX::Source::Songsheet.new(@particulars).song
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
@@ -392,13 +392,13 @@ WOK
         rdf=SiSU_XML_tags::RDF.new(@md)
         dir=SiSU_Env::Info_env.new
         @@xml[:head],@@xml[:body]=[],[]
-        css=SiSU_Env::CSS_select.new(@md).xml_sax
+        css=SiSU_Env::CSS_stylesheet.new(@md)
         encoding=if @sys.locale =~/utf-?8/i; '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
         else                                 '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
         end
         @@xml[:open] =<<WOK
 #{encoding}
-<?xml-stylesheet type="text/css" href="../#{dir.path.style}/#{css}"?>
+#{css.xml_sax}
 #{rdf.comment_xml}
 <document>
 WOK
diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v3/xml_dom.rb
index b4feb949..726e48d5 100644
--- a/lib/sisu/v3/xml_dom.rb
+++ b/lib/sisu/v3/xml_dom.rb
@@ -81,14 +81,14 @@ module SiSU_XML_DOM
         unless @opt.cmd =~/q/
           path=@env.path.output_tell
           loc=@env.url.output_tell
-          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:dom]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:dom]}"
-          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:dom]}"
+          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser}  file://#{@md.file.output_path.xml_dom}/#{@md.file.base_filename.xml_dom}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_dom}/#{@md.file.base_filename.xml_dom}"
+          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_dom}/#{@md.file.base_filename.xml_dom}"
           else @opt.fns
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML DOM',tool).colorize \
           : SiSU_Screen::Ansi.new(@opt.cmd,'XML DOM',tool).green_title_hi
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{path}/#{@md.fnb}/#{@md.fn[:dom]}").flow if @opt.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_dom}/#{@md.file.base_filename.xml_dom}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_XML_DOM::Source::Songsheet.new(@particulars).songsheet
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
@@ -467,13 +467,13 @@ WOK
       def pre
         rdf=SiSU_XML_tags::RDF.new(@md)
         dir=SiSU_Env::Info_env.new
-        css=SiSU_Env::CSS_select.new(@md).xml_dom
+        css=SiSU_Env::CSS_stylesheet.new(@md)
         encoding=if @sys.locale =~/utf-?8/i; '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
         else                                 '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
         end
         @@xml[:open] =<<WOK
 #{encoding}
-<?xml-stylesheet type="text/css" href="../#{dir.path.style}/#{css}"?>
+#{css.xml_dom}
 #{rdf.comment_xml}
 <document>
 WOK