.gitignore

+.DS_Store

CMakeLists.txt

@@ -41,13 +41,27 @@ else (PROTOBUF_FOUND)
 endif(PROTOBUF_FOUND)
 
 if(WIN32)
+    if (EXISTS "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.lib")
+      set(BAMTOOLS_LIBRARIES "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.lib")
+    else()
+      find_library(BAMTOOLS_LIBRARIES libbamtools.lib)
+    endif()
 	set(CMAKE_CXX_FLAGS "/EHsc")
 	set(WIN32_INT 1)
 else(WIN32)
+    if (EXISTS "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.a")
+      set(BAMTOOLS_LIBRARIES "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.a")
+    else()
+      find_library(BAMTOOLS_LIBRARIES libbamtools.a)
+    endif()
 	find_package(ZLIB REQUIRED)
 	set(WIN32_INT 0)
 endif(WIN32)
 
+if (NOT BAMTOOLS_LIBRARIES)
+    message(FATAL_ERROR "Could not find libbamtools")
+endif(NOT BAMTOOLS_LIBRARIES)
+
 configure_file (
   "${PROJECT_SOURCE_DIR}/src/config.h.in"
   "${PROJECT_SOURCE_DIR}/src/config.h"

README.devel.org

+#+TITLE:    Developer's Guide
+#+AUTHOR:   Harold Pimentel
+
+* The build System
+** Running CMake
+   - You should almost always make a separate build tree outside of the main
+     tree. For example, if you have directory 'project' with 'project/src' etc.,
+     you should make a directory outside of project called 'project\_build'. You
+     should change to the new directory and run CMake there.
+
+        mkdir project\_build
+        cd project\_build
+        cmake ../project
+
+** Making projects
+*** Making an Xcode project
+    - Change to your build directory and run:
+
+        cmake -G Xcode ../project
+
+      Your new Xcode project should be in 'project\_build/project.xcodeproj'
+
+*** Making an Eclipse CDT project
+    - Change to your build directory and run:
+
+        cmake -G "Eclipse CDT4 - Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug ../project
+
+      Your new Eclipse CDT project is stored in 'project\_build/.project'. In
+      Eclipse, go to Import -> General -> Existng Projects into Workspace ->
+      Select root directory and choose the 'project\_build' directory.
+      

debian/berkeley-express-doc.doc-base

-Document: express
-Title: doxygen documentation for eXpress
-Author: Adam Roberts, Lior Pachter
-Abstract: Streaming quantification for high-throughput sequencing
- eXpress is a streaming tool for quantifying the abundances of a set of
- target sequences from sampled subsequences. Example applications include
- transcript-level RNA-Seq quantification, allele-specific/haplotype
- expression analysis (from RNA-Seq), transcription factor binding
- quantification in ChIP-Seq, and analysis of metagenomic data. It is
- based on an online-EM algorithm that results in space (memory)
- requirements proportional to the total size of the target sequences and
- time requirements that are proportional to the number of sampled
- fragments. Thus, in applications such as RNA-Seq, eXpress can accurately
- quantify much larger samples than other currently available tools
- greatly reducing computing infrastructure requirements. eXpress can be
- used to build lightweight high-throughput sequencing processing
- pipelines when coupled with a streaming aligner (such as Bowtie), as
- output can be piped directly into eXpress, effectively eliminating the
- need to store read alignments in memory or on disk.
-Section: Science/Biology
-
-Format: pdf
-Files: /usr/share/doc/berkeley-express-doc/express-doc.pdf

debian/berkeley-express-doc.docs

-express-doc.pdf
 sample_data

debian/berkeley-express.install

 usr/bin/express usr/lib/debian-med/bin/
+html		usr/share/doc/berkeley-express
\ No newline at end of file

debian/changelog

-berkeley-express (1.5.1-4) UNRELEASED; urgency=medium
+berkeley-express (1.5.2+dfsg-1) UNRELEASED; urgency=medium
 
+  * Team upload
+
+  [ Steffen Moeller ]
   * d/control: update stadards version to 4.1.3 (no changes required)
   * d/u/metadata:
     - added references to registries
     - yamllint cleanliness
 
+  [ Andreas Tille ]
+  * New upstream version
+  * d/watch: point to GitHub after upstream has added release tags
+  * Point Vcs fields to salsa.debian.org (the URL is also normalized to the
+    package name as per cme and general considerations)
+  * debhelper 11
+  * express-doc.pdf is not in upstream source any more
+  * Exclude binaries and other unneeded files
+  * provide html documentation
+
  -- Steffen Moeller <moeller@debian.org>  Fri, 17 Nov 2017 23:39:43 +0100
 
 berkeley-express (1.5.1-3) unstable; urgency=medium

debian/compat

-9
+11

debian/control

@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
 Uploaders: Michael R. Crusoe <michael.crusoe@gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
                libboost-thread-dev,
                libboost-system-dev,
                libboost-filesystem-dev,
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 9),
                libprotobuf-dev,
                protobuf-compiler
 Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/express.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/express.git
+Vcs-Browser: https://salsa.debian.org/med-team/berkeley-express
+Vcs-Git: https://salsa.debian.org/med-team/berkeley-express.git
 Homepage: http://bio.math.berkeley.edu/eXpress/index.html
 
 Package: berkeley-express

debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: eXpress
 Source: http://bio.math.berkeley.edu/eXpress/downloads/express-1.5.1/express-1.5.1-src.tgz
+Files-Excluded: */linux_build
+                */osx_build
+                */express.xcodeproj
 
 Files: *
 Copyright: © 2011-2013 Adam Roberts, Lior Pachter, UC Berkeley

debian/patches/correct-debug-flags.patch

@@ -6,7 +6,7 @@ Forwarded: no
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,14 +6,13 @@
+@@ -6,14 +6,13 @@ set(${PROJECT_NAME}_VERSION_MAJOR 1)
  set(${PROJECT_NAME}_VERSION_MINOR 5)
  set(${PROJECT_NAME}_VERSION_PATCH 1)
  
@@ -29,21 +29,18 @@ Forwarded: no
      COMPONENTS
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -10,7 +10,7 @@
- set(LIBRARIES ${Boost_LIBRARIES})
+@@ -10,12 +10,12 @@ add_executable(express ${sources} ${head
+ set(LIBRARIES ${Boost_LIBRARIES} ${BAMTOOLS_LIBRARIES})
  
  if (GPERFTOOLS_TCMALLOC) 
 -   set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.a")
 +   set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.so")
  endif (GPERFTOOLS_TCMALLOC)
  
- if(WIN32)
-@@ -20,7 +20,7 @@
- endif(WIN32)
- 
  if (PROTOBUF_FOUND)
--  set(LIBRARIES ${LIBRARIES} "libprotobuf.a")
-+  set(LIBRARIES ${LIBRARIES} "libprotobuf.so")
+   get_filename_component(PROTOBUF_LIB_DIR ${PROTOBUF_LIBRARY} DIRECTORY)
+-  set(LIBRARIES ${LIBRARIES} "${PROTOBUF_LIB_DIR}/libprotobuf.a")
++  set(LIBRARIES ${LIBRARIES} "${PROTOBUF_LIB_DIR}/libprotobuf.so")
  endif(PROTOBUF_FOUND)
  
- target_link_libraries(express ${LIBRARIES})
+ if (WIN32)

debian/patches/drop-zlib

 Description: drop unused zlib dependency
 Author: Michael R. Crusoe <crusoe@ucdavis.edu>
---- express.orig/CMakeLists.txt
-+++ express/CMakeLists.txt
-@@ -45,7 +45,6 @@
- 	set(CMAKE_CXX_FLAGS "/EHsc")
- 	set(WIN32_INT 1)
- else(WIN32)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,7 +57,6 @@ else(WIN32)
+       message(STATUS "Do not try to find libbamtools.a")
+       set(BAMTOOLS_LIBRARIES bamtools)
+     endif()
 -	find_package(ZLIB REQUIRED)
  	set(WIN32_INT 0)
  endif(WIN32)
  
---- express.orig/src/CMakeLists.txt
-+++ express/src/CMakeLists.txt
-@@ -7,7 +7,7 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,7 +7,7 @@ endif(PROTOBUF_FOUND)
  
  add_executable(express ${sources} ${headers} ${PROTO_SOURCES} ${PROTO_HEADERS})
  
--set(LIBRARIES ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
-+set(LIBRARIES ${Boost_LIBRARIES})
+-set(LIBRARIES ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${BAMTOOLS_LIBRARIES})
++set(LIBRARIES ${Boost_LIBRARIES} ${BAMTOOLS_LIBRARIES})
  
  if (GPERFTOOLS_TCMALLOC) 
     set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.a")

debian/patches/fix-bamtools-path

@@ -2,9 +2,9 @@ Author: Michael R. Crusoe <mcrusoe@msu.edu>
 Last-Update: Thu, 12 Feb 2015 09:21:09 +0100
 Description: Fix path to Debian packaged bamtools
 
---- express.orig/CMakeLists.txt
-+++ express/CMakeLists.txt
-@@ -33,10 +33,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,10 +33,11 @@ endif(GPERFTOOLS_TCMALLOC_LIB)
  
  find_package(Protobuf)
  if (PROTOBUF_FOUND)
@@ -18,20 +18,20 @@ Description: Fix path to Debian packaged bamtools
  	set(PROTO_INT 0)
  endif(PROTOBUF_FOUND)
  
---- express.orig/src/CMakeLists.txt
-+++ express/src/CMakeLists.txt
-@@ -16,7 +16,7 @@
- if(WIN32)
-   set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.lib" "${CMAKE_CURRENT_SOURCE_DIR}/../win_build/zlibd.lib")
- else(WIN32)
--  set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.a" "pthread")
-+  set(LIBRARIES ${LIBRARIES} "libbamtools.so" "pthread")
- endif(WIN32)
- 
- if (PROTOBUF_FOUND)
---- express.orig/src/mismatchmodel.cpp
-+++ express/src/mismatchmodel.cpp
-@@ -126,7 +126,7 @@
+@@ -52,7 +53,9 @@ else(WIN32)
+     if (EXISTS "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.a")
+       set(BAMTOOLS_LIBRARIES "${PROJECT_SOURCE_DIR}/bamtools/lib/libbamtools.a")
+     else()
+-      find_library(BAMTOOLS_LIBRARIES libbamtools.a)
++      # find_library(BAMTOOLS_LIBRARIES libbamtools.a)
++      message(STATUS "Do not try to find libbamtools.a")
++      set(BAMTOOLS_LIBRARIES bamtools)
+     endif()
+ 	find_package(ZLIB REQUIRED)
+ 	set(WIN32_INT 0)
+--- a/src/mismatchmodel.cpp
++++ b/src/mismatchmodel.cpp
+@@ -126,7 +126,7 @@ MismatchTable::MismatchTable(string para
    size_t k = 0;
    do {
      if (k > max_indel_size) {
@@ -40,7 +40,7 @@ Description: Fix path to Debian packaged bamtools
                    "truncated at max indel length of %d.",
                    param_file_name.c_str(), max_indel_size);
        break;
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ MismatchTable::MismatchTable(string para
    k = 0;
    do {
      if (k > max_indel_size) {

debian/rules

@@ -7,7 +7,7 @@ export CPPFLAGS
 DH_VERBOSE := 1
 
 %:
-	dh $@ --parallel
+	dh $@
 
 
 override_dh_compress:

debian/watch

-version=3
+version=4
 
-http://bio.math.berkeley.edu/eXpress/ downloads/express-.*/express-(\d[\d\.]+)-src\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+  https://github.com/adarob/eXpress/releases .*/archive/@ANY_VERSION@@ARCHIVE_EXT@

html/css/googlesearch.css

+/**
+ * Default theme
+ *
+ */
+/* Slight reset to make the preview have ample padding. */
+.cse .gsc-control-cse,
+.gsc-control-cse {
+  padding: 2%;
+  width: 96%;
+}
+.cse .gsc-branding,
+.gsc-branding {
+  display: none;
+}
+.cse .gsc-control-cse div,
+.gsc-control-cse div {
+  position: normal;
+}
+/* Selector for entire element. */
+.cse .gsc-control-cse,
+.gsc-control-cse {
+  background-color: #ffffff;
+  border: 1px solid;
+  border-color: #ffffff;
+}
+.cse .gsc-control-cse:after,
+.gsc-control-cse:after {
+  content:".";
+  display:block;
+  height:0;
+  clear:both;
+  visibility:hidden;
+}
+.cse .gsc-resultsHeader,
+.gsc-resultsHeader {
+  border: block;
+}
+/* Search button */
+.cse input.gsc-search-button,
+input.gsc-search-button {width:4.5em; height:1.5em; background-color:rgb(240,240,240); border:solid 1px rgb(150,150,150); text-align:center; color:rgb(100,100,100); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}
+
+/* input */
+  input.gsc-input {height:1.2em; padding:1px !important /*Non-IE6*/; padding:2px /*IE6*/; border:solid 1px rgb(200,200,200); background-color:rgb(255,255,255); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}
+
+/* Inactive tab */
+.cse .gsc-tabHeader.gsc-tabhInactive,
+.gsc-tabHeader.gsc-tabhInactive {
+  border-bottom: none;
+  color: #666666;
+  background-color: #e9e9e9;
+  border: 1px solid;
+  border-color: #e9e9e9;
+  border-bottom: none;
+}
+/* Active tab */
+.cse .gsc-tabHeader.gsc-tabhActive,
+.gsc-tabHeader.gsc-tabhActive {
+  background-color: #FFFFFF;
+  border: 1px solid;
+  border-top: 2px solid;
+  border-color: #e9e9e9;
+  border-top-color: #FF9900;
+  border-bottom: none;
+}
+/* This is the tab bar bottom border. */
+.cse .gsc-tabsArea,
+.gsc-tabsArea {
+  margin-top: 1em;
+  border-bottom: 1px solid #e9e9e9;
+}
+/* Inner wrapper for a result */
+.cse .gsc-webResult.gsc-result,
+.gsc-webResult.gsc-result,
+.gsc-imageResult-column,
+.gsc-imageResult-classic {
+  padding: .25em;
+  border: 1px solid;
+  border-color: #ffffff;
+  margin-bottom: 1em;
+}
+/* Result hover event styling */
+.cse .gsc-webResult.gsc-result:hover,
+.gsc-webResult.gsc-result:hover,
+.gsc-results .gsc-imageResult-classic:hover,
+.gsc-results .gsc-imageResult-column:hover {
+  border: 1px solid;
+  border-color: #FFFFFF;
+}
+/*Promotion Settings*/
+/* The entire promo */
+.cse .gs-promotion,
+.gs-promotion {
+  background-color: #FFFFFF;
+  border: 1px solid;
+  border-color: #336699;
+}
+/* Promotion image */
+.cse .gs-promotion .gs-promotion-image,
+.gs-promotion .gs-promotion-image {}
+/* Promotion links */
+.cse .gs-promotion a.gs-title:link,
+.gs-promotion a.gs-title:link,
+.cse .gs-promotion a.gs-title:link *,
+.gs-promotion a.gs-title:link *,
+.cse .gs-promotion .gs-snippet a:link,
+.gs-promotion .gs-snippet a:link {
+  color: #0000CC;
+}
+.cse .gs-promotion a.gs-title:visited,
+.gs-promotion a.gs-title:visited,
+.cse .gs-promotion a.gs-title:visited *,
+.gs-promotion a.gs-title:visited *,
+.cse .gs-promotion .gs-snippet a:visited,
+.gs-promotion .gs-snippet a:visited {
+  color: #0000CC;
+}
+.cse .gs-promotion a.gs-title:hover,
+.gs-promotion a.gs-title:hover,
+.cse .gs-promotion a.gs-title:hover *,
+.gs-promotion a.gs-title:hover *,
+.cse .gs-promotion .gs-snippet a:hover,
+.gs-promotion .gs-snippet a:hover {
+  color: #0000CC;
+}
+.cse .gs-promotion a.gs-title:active,
+.gs-promotion a.gs-title:active,
+.cse .gs-promotion a.gs-title:active *,
+.gs-promotion a.gs-title:active *,
+.cse .gs-promotion .gs-snippet a:active,
+.gs-promotion .gs-snippet a:active {
+  color: #0000CC;
+}
+/* Promotion snippet */
+.cse .gs-promotion .gs-snippet,
+.gs-promotion .gs-snippet,
+.cse .gs-promotion .gs-title .gs-promotion-title-right,
+.gs-promotion .gs-title .gs-promotion-title-right,
+.cse .gs-promotion .gs-title .gs-promotion-title-right *,
+.gs-promotion .gs-title .gs-promotion-title-right * {
+  color: #000000;
+}
+/* Promotion url */
+.cse .gs-promotion .gs-visibleUrl,
+.gs-promotion .gs-visibleUrl {
+  color: #008000;
+}
+/* Style for auto-completion table
+ * .gsc-completion-selected : styling for a suggested query which the user has moused-over
+ * .gsc-completion-container : styling for the table which contains the completions
+ */
+.gsc-completion-selected {
+  background: #D5E2FF;
+}
+.gsc-completion-container {
+  font-family: Arial, sans-serif;
+  font-size: 13px;
+  position: absolute;
+  background: white;
+  border: 1px solid #666666;
+  margin-left: 0;
+  margin-right: 0;
+  /* The top, left, and width are set in JavaScript. */
+}
+
+/* Full URL */
+.gs-webResult div.gs-visibleUrl-short {
+  display: none;
+}
+.gs-webResult div.gs-visibleUrl-long {
+  display: block;
+}

html/css/mf54_grid.css

+/****************************************************************/
+/*   Design:   Multiflex-5.4                                    */
+/*   Type:     Design with sidebar                              */
+/*   File:     Grid Toolbox                                     */
+/*   Option:   Design with sidebar                              */
+/*--------------------------------------------------------------*/
+/*   Design:   www.1234.info                                    */
+/*   Date:     March 13, 2008                                   */
+/*--------------------------------------------------------------*/
+/*   License:  Fully open source without restrictions.          */
+/*             Please keep footer credits with the words        */
+/*             "Design by 1234.info". Thank you!                */
+/****************************************************************/
+#wrapper {
+	min-height:100%;
+	position:relative;
+}
+/******************/
+/* GLOBAL LAYOUT  */
+/******************/
+ body {margin:0; font-size:62.5%; background-color:rgb(164,174,184); font-family:arial,sans-serif;} /*Font-size: 1.0em = 10px when browser default size is 16px*/
+.container {position:relative; width:978px; padding-top:10px; padding-bottom:20px; margin:0 auto; font-size:1.0em; }
+.header {width:958px; min-height:130px /*Non-IE6*/; height:auto !important /*Non-IE6*/; height:130px /*IE6*/; border-left:solid 10px rgb(0,41,84); border-right:solid 10px rgb(0,41,84); background:rgb(205,215,225) url(../img/bg_header.jpg) repeat-x /*Total header background image entered here. Height: 125px*/; font-size:1.0em;}
+.header-top {clear:both; width:958px; height:100px; background:rgb(30,70,110) url(../img/bg_header_top.jpg) repeat-x /*Top header background image entered here. Height: 100px*/; font-size:1.0em;}
+.header-bottom {clear:both; width:958px; min-height:30px /*Non-IE6*/; height:auto !important /*Non-IE6*/; height:30px /*IE6*/; background:rgb(205,215,225) url(../img/bg_header_bottom.jpg) repeat-x /*Bottom header background image entered here: Height: 25 px*/; font-size:1.0em;}
+.navbar {white-space:nowrap /*IE hack*/; float:left; width:958px; border-left:solid 10px rgb(0,41,84); border-right:solid 10px rgb(0,41,84); background-color:rgb(205,215,225); font-family:tahoma,arial,sans-serif; font-size:130% !important /*Non-IE6*/; font-size:120% /*IE6*/;} /*Color navigation bar normal mode*/
+.main {clear:both; width:958px; padding:10px 0 20px 0; border-left:solid 10px rgb(0,41,84); border-right:solid 10px rgb(0,41,84); background-color:rgb(0,41,84); font-size:1.0em;}
+.content {display:inline; /*Fix IE floating margin bug*/; float:left; width:676px; background-color:rgb(0,41,84); font-size:1.0em; overflow:visible !important /*Non-IE6*/; overflow:hidden /*IE6*/;}
+.subcontent {display:inline /*Fix IE floating margin bug*/; float:right; width:270px; background-color:rgb(0,41,84); font-size:1.0em; overflow:visible !important /*Non-IE6*/; overflow:hidden /*IE6*/;}
+.footer {clear:both; width:958px; padding:1.0em 0 1.0em 0; border-left:solid 10px rgb(0,41,84); border-right:solid 10px rgb(0,41,84); background-color:rgb(205,215,225); font-size:1.1em !important /*Non-IE6*/; font-size:1.0em /*IE6*/; overflow:visible !important /*Non-IE6*/; overflow:hidden /*IE6*/;}
+
+/****************/
+/*  HEADER-TOP  */
+/****************/
+
+/* SITENAME AND SLOGAN */
+.sitelogo {width:100px; height:100px; position:absolute; z-index:1; margin:1px 0 0 0px;}
+.sitelogo a img {height:105px;}
+.sitename {width:500px; height:70px; position:absolute; z-index:1; margin:27px 0 0 110px; overflow:hidden;}
+.sitename h1 {font-family:"trebuchet ms",arial,sans serif; margin-top:-5px; font-weight:normal; font-size:300% !important /*Non-IE6*/; font-weight:bold; font-size:300% /*IE6*/;}
+.sitename h2 {font-family:verdana,arial,sans serif; margin-top:-5px; padding-bottom:2px; color:rgb(210,150,0); height:20px; font-weight:normal; font-size:150% !important /*Non-IE6*/; font-size:150% /*IE6*/;}
+.sitename a{text-decoration:none; color:rgb(240,240,240);}
+/*.sitename a:hover {color:rgb(210,150,0)}*/
+
+/* BUTTON NAVIGATION */
+.navbutton {width:400px; position:absolute; z-index:2; margin-top:10px; margin-left:547px !important /*Non-IE6*/; margin-left:550px /*IE6*/;}
+.navbutton ul {float:right;}
+.navbutton li {display:inline; list-style:none;}
+.navbutton li a {padding-left:3px;}
+.navbutton a:hover {text-decoration:none;}
+.navbutton a img {height:80px;}
+
+/* GLOBAL NAVIGATION */
+.navglobal {width:600px; position:absolute; z-index:3; margin-top:65px; margin-left:349px !important /*Non-IE6*/; margin-left:351px /*IE6*/;}
+.navglobal ul {float:right; font-weight:normal;}	
+.navglobal li {display:inline; list-style:none;}
+.navglobal li a {display:block; float:left; padding:2px 5px 2px 5px; color:rgb(125,125,125); text-decoration:none; font-size:130% !important /*Non-IE6*/; font-size:120% /*IE6*/;}
+.navglobal a:hover {text-decoration:none; color:rgb(255,255,255);}
+
+/*******************/
+/*  HEADER BOTTOM  */
+/*******************/
+
+/* BREADCRUMB */
+.header-bottom ul {float:left; width:430px; list-style:none; padding:8px 0 3px 10px !important /*Non-IE6*/; padding:8px 0 3px 10px /*IE6*/;}
+.header-bottom ul li {display:inline; padding:0 0 0 10px; background:transparent url(../img/bg_bullet_arrow.gif) no-repeat 0 50%; font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}
+.header-bottom ul li.nobullet {display:inline; padding:0; background:none; color:rgb(75,75,75);}
+.header-bottom ul a {color:rgb(125,125,125); font-weight:bold; text-decoration:none;}
+.header-bottom ul a:hover {color:rgb(255,255,255);}
+
+/* SEARCH FORM */
+.header-bottom .searchform {float:right; width:430px;}
+.header-bottom .searchform form fieldset {float:right; border:none; padding-top:5px; padding-right:10px;}
+.header-bottom .searchform input.field {width:15.0em; height:1.2em; padding:1px !important /*Non-IE6*/; padding:2px /*IE6*/; border:solid 1px rgb(200,200,200); background-color:rgb(255,255,255); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}
+.header-bottom .searchform input.button {width:4.5em; height:1.5em; background-color:rgb(240,240,240); border:solid 1px rgb(150,150,150); text-align:center; color:rgb(100,100,100); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}
+.header-bottom .searchform input.button:hover {cursor:pointer; border:solid 1px rgb(80,80,80); background-color:rgb(220,220,220); color:rgb(80,80,80);}
+
+/********************/
+/*  NAVIGATION BAR  */
+/********************/
+
+/* MAIN MENU */
+.navbar ul {list-style-type:none;}
+.navbar ul li {float:left; z-index:auto !important /*Non-IE6*/; z-index:1000 /*IE6*/; background-color:rgb(205,215,225);}
+.navbar ul li a {float:none !important /*Non-IE6*/; float:left /*IE-6*/; display:block; height:3.1em; line-height:3.1em; padding:0 16px 0 16px; text-decoration:none; font-weight:bold; color:rgb(100,100,100); border-right:solid 0px rgb(215,215,215);}
+.navbar ul li ul {display:none; border:none;}
+
+/* SUBMENU (Non-IE6 hovering) */
+.navbar ul li:hover {position:relative;} /*Sylvain IE hack*/
+.navbar ul li:hover a {background-color:rgb(215,220,235); text-decoration:none;} /*Color main cells hovering mode*/
+.navbar ul li:hover ul {display:block; width:10.0em; position:absolute; z-index:1000; top:3.0em; margin-top:0.1em; left:0; padding:0px 16px 0px 16px; border-top:solid 1px rgb(215,215,215);}
+.navbar ul li:hover ul li a {white-space:normal; display:block; width:10.0em; height:auto; line-height:1.3em; margin-left:-17px; padding:4px 16px 4px 16px; border-right:solid 1px rgb(215,215,215); border-left:solid 1px rgb(215,215,215); border-bottom: solid 1px rgb(215,215,215); background-color:rgb(235,235,235); font-weight:normal; color:rgb(100,100,100);} /*Color subcells normal mode*/
+.navbar ul li:hover ul li a:hover {background-color:rgb(205,215,225); text-decoration:none;} /*Color subcells hovering mode*/
+
+/* SUBMENU (IE6 hovering) */
+.navbar table {position:absolute; z-index:1000; top:0px; left:-1px; border-collapse:collapse;}
+.navbar ul li a:hover {position:relative /*Sylvain IE hack*/; z-index:1000 /*Sylvain IE hack*/; background-color:rgb(235,235,235); text-decoration:none;} /*Color main cells hovering mode*/
+.navbar ul li a:hover ul {display:block; width:10.0em; position:absolute; z-index:1000; top:3.1em; t\op:3.0em; left:0px; marg\in-top:0.1em; border-top:solid 1px rgb(215,215,215); }
+.navbar ul li a:hover ul li a {white-space:normal; display:block; w\idth:10.0em; height:1px; line-height:1.3em; padding:4px 16px 4px 16px; border-right:solid 1px rgb(215,215,215); border-left:solid 1px rgb(215,215,215); border-bottom: solid 1px rgb(215,215,215); background-color:rgb(235,235,235); font-weight:normal; color:rgb(100,100,100);} /*Color subcells normal mode*/
+.navbar ul li a:hover ul li a:hover {background-color:rgb(205,215,225); text-decoration:none;} /*Color subcells hovering mode*/
+
+/************/
+/*  CONTENT */
+/************/
+
+/* CONTAINER (NO BOXES) */
+.content-1col-nobox {width:676px; background-color:rgb(255,255,255);}
+.content-2col-nobox-leftcolumn {display:inline; float:left; width:337px; border-right:solid 1px rgb(215,215,215) /*Use this statement if left column is longer than the right column. Activate by removing "xx_" from property name*/; background-color:rgb(255,255,255);}
+.content-2col-nobox-rightcolumn {display:inline; float:right; width:337px; border-left:solid 1px rgb(215,215,215)/*Use this statement if right columnn is longer than the left column. De-activate by adding "xx_" to propery name*/; background-color:rgb(255,255,255);}
+
+/* CONTAINER (BOXES) */
+.content-1col-box {width:676px; background-color:transparent;}
+.content-2col-box-leftcolumn {display:inline; float:left; width:333px; background-color:transparent;}
+.content-2col-box-rightcolumn {display:inline; float:right; width:333px;  background-color:transparent;}
+.content-2col-box {width:333px; background-color:rgb(255,255,255);}
+
+/***************/
+/* SUBCONTENT  */
+/***************/
+
+.subcontent-box {width:270px; float:right; background-color:rgb(255,255,255);}
+
+/************/
+/*  FOOTER  */
+/************/
+.footer p {clear:both; line-height:1.3em; text-align:center; color:rgb(125,125,125); font-weight:bold; font-size:110%;}
+.footer p.credits {clear:both; font-weight:normal;}
+.footer a, .footer a:visited {text-decoration:underline; color:rgb(125,125,125);}
+.footer a:hover {text-decoration:none; color:rgb(0,0,0);}
+
+/*********************/
+/*  ROUNDED CORNERS  */
+/*********************/
+
+/* PAGE */
+.corner-page-top {width:978px; height:10px; background:transparent url(../img/bg_corner_page_top.gif) no-repeat; overflow:hidden;}
+.corner-page-bottom {width:978px; height:10px; padding-bottom:20px; background:transparent url(../img/bg_corner_page_bottom.gif) no-repeat; overflow:hidden;}
+
+/* CONTENT */
+.corner-content-1col-top {clear:both; width:676px; height:7px; background:white url(../img/bg_corner_content_1col_top.gif) no-repeat; overflow:hidden;}
+.corner-content-1col-bottom {clear:both; width:676px; height:7px; margin-bottom:10px; background:transparent url(../img/bg_corner_content_1col_bottom.gif) no-repeat; overflow:hidden;}
+.corner-content-2col-top {width:333px; height:7px; background:transparent url(../img/bg_corner_content_2col_top.gif) no-repeat; overflow:hidden;}
+.corner-content-2col-bottom {width:333px; height:7px; margin-bottom:10px; background:transparent url(../img/bg_corner_content_2col_bottom.gif) no-repeat; overflow:hidden;}
+
+/* SUBCONTENT */
+.corner-subcontent-top {clear:both; width:270px; height:7px; background:transparent url(../img/bg_corner_subcontent_top.gif) no-repeat; overflow:hidden;}
+.corner-subcontent-bottom {clear:both; width:270px; height:7px; margin-bottom:10px; background:transparent url(../img/bg_corner_subcontent_bottom.gif) no-repeat; overflow:hidden;}
+
+/******************/
+/*  CLEAR FLOATS  */
+/******************/
+.container:after, .header:after, .header-top:after, .header-bottom:after, .navbar:after, .main:after, .content:after, .content div:after, .subcontent:after, .subcontent div:after, .footer:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
+.content-1col-nobox:after, .content-2col-nobox-leftcolumn:after, .content-2col-nobox-rightcolumn:after, .content-1col-box:after, .content-2col-box-leftcolumn:after, .content-2col-box-rightcolumn:after, .content-2col-box:after, .subcontent-box:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
+.corner-content-1col-top:after, .corner-content-1col-bottom:after, .corner-content-2col-top:after, .corner-content-2col-bottom:after, .corner-subcontent-top:after, .corner-subcontent-bottom:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
+ p:after {content:"."; display:block; height:0; /*clear:both Do not use here to avoid paragraphs clearing next to images;*/  visibility:hidden;}
+ 
+ 
+ 
+/**************/
+/*  PRINTING  */
+/**************/
+/* To avoid that some layouts may break during printing */
+/* we remove one vertical border-line for the columns  */                 
+@media print {.content-2col-nobox-rightcolumn {display:inline; float:right; width:337px; border-left:none; background-color:rgb(255,255,255);}}
+
+/******************************************/
+/*  YOUR OWN USER STYLES                  */
+/*  If you want to add your own styles,   */
+/*  then add them here below in order to  */
+/*  avoid a mixup with default styles.    */
+/******************************************/
+
+/* MAIL FORM */
+.mailform {float:right; width:450px;}
+.mailform form fieldset {float:right; border:none; padding-top:5px; padding-right:0px;}
+.mailform input.field {width:12em; height:1.2em; padding:1px !important /*Non-IE6*/; padding:2px /*IE6*/; border:solid 1px rgb(200,200,200); background-color:rgb(255,255,255); font-size:90% !important /*Non-IE6*/; font-size:90% /*IE6*/;}
+.mailform input.button {width:5.6em; height:1.6em; background-color:rgb(240,240,240); border:solid 1px rgb(150,150,150); text-align:center; color:rgb(100,100,100); font-size:90% !important /*Non-IE6*/; font-size:90% /*IE6*/;}
+.mailform input.button:hover {cursor:pointer; border:solid 1px rgb(80,80,80); background-color:rgb(220,220,220); color:rgb(80,80,80);}
+
+/* SOURCE CODE */
+.sc{font-family: Andale Mono, Lucida Console, Monaco, fixed, monospace, code; color: #000000; background-color: #eee;font-size: 12px;border: 1px dashed #999999;line-height: 14px; padding: 5px; white-space:nowrap; overflow:auto; width: 95%}
+
+/* FILE OUTPUT */
+.output{font-family: Andale Mono, Lucida Console, Monaco, fixed, monospace, code; color: #000000; background-color: #eee;font-size: 12px;border: 1px dashed #999999;line-height: 14px; padding: 5px; overflow:auto; width: 95%}
\ No newline at end of file