[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

Stephane Popinet popinet at users.sf.net
Fri May 15 02:54:32 UTC 2009


The following commit has been merged in the upstream branch:
commit db663cd14213e1c084c31e5f0315f6b0ee8489b5
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Aug 30 11:18:34 2007 +1000

    Updated CSS stylesheet for consistency with wiki
    
    darcs-hash:20070830011834-d4795-826979364c0b1292dbbee49e8187dc89fda19263.gz

diff --git a/doc/examples/gfs2tex b/doc/examples/gfs2tex
index 10f22c6..afefcc0 100755
--- a/doc/examples/gfs2tex
+++ b/doc/examples/gfs2tex
@@ -16,4 +16,4 @@ for start in sys.argv[1:]:
             example = gfs2tex.Example(root)
             if not os.access("examples/" + example.path,os.F_OK):
                 os.symlink("../" + example.path, "examples/" + example.path)
-            example.write(gfsclasses.klass)
+            example.write(gfsclasses.klass,style="examples.css")
diff --git a/doc/examples/gfs2tex.py b/doc/examples/gfs2tex.py
index a79e45d..13cfc59 100644
--- a/doc/examples/gfs2tex.py
+++ b/doc/examples/gfs2tex.py
@@ -95,7 +95,7 @@ class Example:
         else:
             self.runtime = None
             
-    def write(self,dico,file=None):
+    def write(self,dico,file=None,style=None):
         if file == None:
             file = open(self.path + "/" + self.name + ".tex", 'w')
 	file.write(self.section + "{\\label{" + self.name + "}")
@@ -118,14 +118,19 @@ class Example:
         file.write("\\item[Running time]" + self.time + "\n")
         file.write("\\end{description}\n")
         file.write("\n".join(self.description))
-        self.colorize(dico)
+        self.colorize(dico,style)
 
-    def colorize(self,dico):
+    def colorize(self,dico,style=None):
         file = open(self.path + "/" + self.name + ".gfs")
         out = open(self.path + "/" + self.name + ".gfs.html", 'w')
         path = "../" * (self.path.count("/") + 3) + "reference/"
         out.write("<html><head><title>\n" + self.name + ".gfs")
-        out.write("</title></head><body><tt>\n")
+	if style == None:
+	    out.write('</title></head><body><tt class="gfs">\n')
+	else:
+	    out.write('</title><link rel="stylesheet" type="text/css" href="' + \
+		      ["../","../../"][self.path.count("/")] + \
+		      style + '"></head><body><tt class="gfs">\n')
         infile = insthg = 0
         for line in file:
             l = ""
@@ -150,9 +155,9 @@ class Example:
                 if infile:
                     record = line.split()
                     if insthg or len(record) > 1:
-                        out.write("<font color=\"#5285B4\">")
+                        out.write('<div class="comment">')
                         out.write(l)
-                        out.write("</font><br>")
+                        out.write('</div>')
                         insthg = 1
                 else:
                     record = line.split()
diff --git a/doc/share/darcs.css b/doc/share/darcs.css
index 5fabc16..d9b7f2c 100644
--- a/doc/share/darcs.css
+++ b/doc/share/darcs.css
@@ -1,28 +1,45 @@
 BODY {
+  font: x-small sans-serif;
   background: white;
   color: black;
-  font-family: arial,sans-serif;
   margin: 0;
   padding: 1em;
 }
 
-A:link {
-  background: transparent;
-  color: #8081b3;
+A {
   text-decoration: none;
+  color: #002bb8;
+  background: none;
   border-style: none;
 }
 
 A:visited {
-  background: transparent;
-  color: #494a82;
-  text-decoration: none;
+  color: #5a3696;
+}
+
+A:active {
+  color: #faa700;
 }
 
 A:hover {
   text-decoration: underline;
 }
 
+.section a {
+  color: black;
+  text-decoration: none;
+}
+
+.subsection a {
+  color: black;
+  text-decoration: none;
+}
+
+.subsubsection a {
+  color: black;
+  text-decoration: none;
+}
+
 A IMG {border: none; }
 
 PRE     {
@@ -33,26 +50,32 @@ PRE     {
   white-space: pre;
 }
 
+H1, H2, H3, H4 {
+  color: black;
+}
+
 H1      {
-  color: #494a82;
   font-size: 24px ;
 }
 
 H2      {
-  color: #494a82;
   font-size: 18px;
 }
 
 H3      {
-  color: #494a82;
   font-size: 16px;
 }
 
 H4      {
-  color: #494a82;
   font-size: 14px;
 }
 
+/* GFS parameter files */
+
+.gfs .comment {
+    color: #17A729;
+}
+
 /* headers for darcs command options */
 .cmd-opt-hdr     {
   color: #494a82;
diff --git a/test/gfs2tex b/test/gfs2tex
index e1bf87b..ce9dd39 100755
--- a/test/gfs2tex
+++ b/test/gfs2tex
@@ -17,4 +17,4 @@ for start in sys.argv[1:]:
             example = gfs2tex.Example(root)
             if not os.access("tests/" + example.path,os.F_OK):
                 os.symlink("../" + example.path, "tests/" + example.path)
-            example.write(gfsclasses.klass)
+            example.write(gfsclasses.klass,style="tests.css")

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list