diff --git a/docs/CompilerDriver.html b/docs/CompilerDriver.html
index ccb45358db6..9d87c05081c 100644
--- a/docs/CompilerDriver.html
+++ b/docs/CompilerDriver.html
@@ -5,7 +5,7 @@
diff --git a/docs/CompilerDriverTutorial.html b/docs/CompilerDriverTutorial.html
index a264b0aa787..12471c3822a 100644
--- a/docs/CompilerDriverTutorial.html
+++ b/docs/CompilerDriverTutorial.html
@@ -5,7 +5,7 @@
Tutorial - Using LLVMC
-
+
diff --git a/docs/llvm-rst.css b/docs/llvm-rst.css
deleted file mode 100644
index a5d697e7e3c..00000000000
--- a/docs/llvm-rst.css
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * LLVM documentation style sheet
- */
-
-/* Common styles */
-.body { color: black; background: white; margin: 0 0 0 0 }
-
-/* No borders on image links */
-a:link img, a:visited img {border-style: none}
-
-address img { float: right; width: 88px; height: 31px; }
-address { clear: right; }
-
-TR, TD { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; }
-TH { border: 2px solid gray; font-weight: bold; font-size: 105%;
- background: url("img/lines.gif");
- font-family: "Georgia,Palatino,Times,Roman,SanSerif"; text-align:center;
- vertical-align: middle; }
-TABLE { text-align: center; border: 2px solid black;
- border-collapse: collapse; margin-top: 1em; margin-left: 1em;
- margin-right: 1em; margin-bottom: 1em; }
-/*
- * Documentation
- */
-/* Common for title and header */
-h1, h2 {
- color: black; background: url("img/lines.gif");
- font-family: "Georgia,Palatino,Times,Roman,SanSerif"; font-weight: bold;
- border-width: 1px;
- border-style: solid none solid none;
- text-align: center;
- vertical-align: middle;
- padding-left: 8pt;
- padding-top: 1px;
- padding-bottom: 2px;
-}
-
-h1 {
- text-align: center;
- font-size: 22pt;
- margin: 20pt 0pt 5pt 0pt;
-}
-
-.title { padding-top: 0; margin-top: 0; text-align: left;
- font-size: 25pt }
-
-h2 { width: 75%;
- text-align: left; font-size: 12pt; padding: 4pt 4pt 4pt 4pt;
- margin: 1.5em 0.5em 0.5em 0.5em }
-
-h3 { margin: 2.0em 0.5em 0.5em 0.5em;
- font-weight: bold; font-style: oblique;
- border-bottom: 1px solid #999999; font-size: 12pt;
- width: 75%; }
-
-#contents { display: none; }
-ul { list-style-type: decimal }
-
-.doc_author { text-align: left; font-weight: bold; padding-left: 20pt }
-.doc_text { text-align: left; padding-left: 20pt; padding-right: 10pt }
-
-.doc_footer { text-align: left; padding: 0 0 0 0 }
-
-.doc_hilite { color: blue; font-weight: bold; }
-
-.doc_table { text-align: center; width: 90%;
- padding: 1px 1px 1px 1px; border: 1px; }
-
-.doc_table_nw { text-align: center; border: 1px;
- padding: 1px 1px 1px 1px; }
-
-.doc_warning { color: red; font-weight: bold }
-
-.literal-block { border: solid 1px gray; background: #eeeeee;
- margin: 0 1em 0 1em;
- padding: 1em 2em 1em 1em;
- display:table;
- }
-.doc_notes { background: #fafafa; border: 1px solid #cecece; padding: 0.1em }
-
-TABLE.layout { text-align: left; border: none; border-collapse: collapse;
- padding: 4px 4px 4px 4px; }
-TR.layout { border: none; padding: 4pt 4pt 2pt 2pt; }
-TD.layout { border: none; padding: 4pt 4pt 2pt 2pt;
- vertical-align: top;}
-TD.left { border: none; padding: 4pt 4pt 2pt 2pt; text-align: left;
- vertical-align: top;}
-TD.right { border: none; padding: 4pt 4pt 2pt 2pt; text-align: right;
- vertical-align: top;}
-TH.layout { border: none; font-weight: bold; font-size: 105%;
- text-align:center; vertical-align: middle; }
-
-/* Left align table cell */
-.td_left { border: 2px solid gray; text-align: left; }
-
-.toc-backref { color: black; text-decoration: none; }
diff --git a/docs/llvm.css b/docs/llvm.css
index 3564171126d..611b138c898 100644
--- a/docs/llvm.css
+++ b/docs/llvm.css
@@ -12,18 +12,19 @@ address img { float: right; width: 88px; height: 31px; }
address { clear: right; }
TR, TD { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; }
-TH { border: 2px solid gray; font-weight: bold; font-size: 105%;
+TH { border: 2px solid gray; font-weight: bold; font-size: 105%;
background: url("img/lines.gif");
- font-family: "Georgia,Palatino,Times,Roman,SanSerif"; text-align:center;
+ font-family: "Georgia,Palatino,Times,Roman,SanSerif";
+ text-align:center;
vertical-align: middle; }
-TABLE { text-align: center; border: 2px solid black;
- border-collapse: collapse; margin-top: 1em; margin-left: 1em;
+TABLE { text-align: center; border: 2px solid black;
+ border-collapse: collapse; margin-top: 1em; margin-left: 1em;
margin-right: 1em; margin-bottom: 1em; }
-/*
- * Documentation
+/*
+ * Documentation
*/
/* Common for title and header */
-.doc_title, .doc_section, .doc_subsection {
+.doc_title, .doc_section, .doc_subsection, h1, h2 {
color: black; background: url("img/lines.gif");
font-family: "Georgia,Palatino,Times,Roman,SanSerif"; font-weight: bold;
border-width: 1px;
@@ -35,17 +36,21 @@ TABLE { text-align: center; border: 2px solid black;
padding-bottom: 2px
}
-.doc_title { text-align: left; font-size: 25pt }
-.doc_section { text-align: center; font-size: 22pt;
- margin: 20pt 0pt 5pt 0pt; }
-.doc_subsection { width: 75%;
- text-align: left; font-size: 12pt; padding: 4pt 4pt 4pt 4pt;
- margin: 1.5em 0.5em 0.5em 0.5em }
+h1, .doc_section { text-align: center; font-size: 22pt;
+ margin: 20pt 0pt 5pt 0pt; }
+
+.doc_title, .title { text-align: left; font-size: 25pt }
+
+h2, .doc_subsection { width: 75%;
+ text-align: left; font-size: 12pt;
+ padding: 4pt 4pt 4pt 4pt;
+ margin: 1.5em 0.5em 0.5em 0.5em }
+
+h3, .doc_subsubsection { margin: 2.0em 0.5em 0.5em 0.5em;
+ font-weight: bold; font-style: oblique;
+ border-bottom: 1px solid #999999; font-size: 12pt;
+ width: 75%; }
-.doc_subsubsection { margin: 2.0em 0.5em 0.5em 0.5em;
- font-weight: bold; font-style: oblique;
- border-bottom: 1px solid #999999; font-size: 12pt;
- width: 75%; }
.doc_author { text-align: left; font-weight: bold; padding-left: 20pt }
.doc_text { text-align: left; padding-left: 20pt; padding-right: 10pt }
@@ -53,32 +58,42 @@ TABLE { text-align: center; border: 2px solid black;
.doc_hilite { color: blue; font-weight: bold; }
-.doc_table { text-align: center; width: 90%;
+.doc_table { text-align: center; width: 90%;
padding: 1px 1px 1px 1px; border: 1px; }
-.doc_table_nw { text-align: center; border: 1px;
+.doc_table_nw { text-align: center; border: 1px;
padding: 1px 1px 1px 1px; }
.doc_warning { color: red; font-weight: bold }
-.doc_code { border: solid 1px gray; background: #eeeeee;
- margin: 0 1em 0 1em;
+.doc_code, .literal-block
+ { border: solid 1px gray; background: #eeeeee;
+ margin: 0 1em 0 1em;
padding: 0 1em 0 1em;
display:table;
}
-.doc_notes { background: #fafafa; border: 1px solid #cecece; padding: 0.1em }
+
+.doc_notes { background: #fafafa; border: 1px solid #cecece;
+ padding: 0.1em }
TABLE.layout { text-align: left; border: none; border-collapse: collapse;
padding: 4px 4px 4px 4px; }
TR.layout { border: none; padding: 4pt 4pt 2pt 2pt; }
-TD.layout { border: none; padding: 4pt 4pt 2pt 2pt;
+TD.layout { border: none; padding: 4pt 4pt 2pt 2pt;
vertical-align: top;}
-TD.left { border: none; padding: 4pt 4pt 2pt 2pt; text-align: left;
+TD.left { border: none; padding: 4pt 4pt 2pt 2pt; text-align: left;
vertical-align: top;}
-TD.right { border: none; padding: 4pt 4pt 2pt 2pt; text-align: right;
+TD.right { border: none; padding: 4pt 4pt 2pt 2pt; text-align: right;
vertical-align: top;}
-TH.layout { border: none; font-weight: bold; font-size: 105%;
+TH.layout { border: none; font-weight: bold; font-size: 105%;
text-align:center; vertical-align: middle; }
/* Left align table cell */
.td_left { border: 2px solid gray; text-align: left; }
+
+/* ReST-specific */
+.title { margin-top: 0}
+#contents { display: none; }
+div.contents ul { list-style-type: decimal }
+.literal-block { padding: 1em 2em 1em 1em }
+.toc-backref { color: black; text-decoration: none; }
diff --git a/tools/llvmc/doc/Makefile b/tools/llvmc/doc/Makefile
index d126e51c6ea..65e6b9b5e0f 100644
--- a/tools/llvmc/doc/Makefile
+++ b/tools/llvmc/doc/Makefile
@@ -10,19 +10,17 @@
LEVEL=../../..
include $(LEVEL)/Makefile.config
-RST_CSS=llvm-rst.css
DOC_DIR=../../../docs
-RST2HTML=rst2html --stylesheet=$(RST_CSS) --link-stylesheet
+RST2HTML=rst2html --stylesheet=llvm.css --link-stylesheet
-all : LLVMC-Reference.html LLVMC-Tutorial.html $(RST_CSS)
- $(CP) $(RST_CSS) $(DOC_DIR)/$(RST_CSS)
+all : LLVMC-Reference.html LLVMC-Tutorial.html
$(CP) LLVMC-Reference.html $(DOC_DIR)/CompilerDriver.html
$(CP) LLVMC-Tutorial.html $(DOC_DIR)/CompilerDriverTutorial.html
-LLVMC-Tutorial.html : LLVMC-Tutorial.rst $(RST_CSS)
+LLVMC-Tutorial.html : LLVMC-Tutorial.rst
$(RST2HTML) $< $@
-LLVMC-Reference.html : LLVMC-Reference.rst $(RST_CSS)
+LLVMC-Reference.html : LLVMC-Reference.rst
$(RST2HTML) $< $@
clean :
diff --git a/tools/llvmc/doc/llvm-rst.css b/tools/llvmc/doc/llvm-rst.css
deleted file mode 100644
index a5d697e7e3c..00000000000
--- a/tools/llvmc/doc/llvm-rst.css
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * LLVM documentation style sheet
- */
-
-/* Common styles */
-.body { color: black; background: white; margin: 0 0 0 0 }
-
-/* No borders on image links */
-a:link img, a:visited img {border-style: none}
-
-address img { float: right; width: 88px; height: 31px; }
-address { clear: right; }
-
-TR, TD { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; }
-TH { border: 2px solid gray; font-weight: bold; font-size: 105%;
- background: url("img/lines.gif");
- font-family: "Georgia,Palatino,Times,Roman,SanSerif"; text-align:center;
- vertical-align: middle; }
-TABLE { text-align: center; border: 2px solid black;
- border-collapse: collapse; margin-top: 1em; margin-left: 1em;
- margin-right: 1em; margin-bottom: 1em; }
-/*
- * Documentation
- */
-/* Common for title and header */
-h1, h2 {
- color: black; background: url("img/lines.gif");
- font-family: "Georgia,Palatino,Times,Roman,SanSerif"; font-weight: bold;
- border-width: 1px;
- border-style: solid none solid none;
- text-align: center;
- vertical-align: middle;
- padding-left: 8pt;
- padding-top: 1px;
- padding-bottom: 2px;
-}
-
-h1 {
- text-align: center;
- font-size: 22pt;
- margin: 20pt 0pt 5pt 0pt;
-}
-
-.title { padding-top: 0; margin-top: 0; text-align: left;
- font-size: 25pt }
-
-h2 { width: 75%;
- text-align: left; font-size: 12pt; padding: 4pt 4pt 4pt 4pt;
- margin: 1.5em 0.5em 0.5em 0.5em }
-
-h3 { margin: 2.0em 0.5em 0.5em 0.5em;
- font-weight: bold; font-style: oblique;
- border-bottom: 1px solid #999999; font-size: 12pt;
- width: 75%; }
-
-#contents { display: none; }
-ul { list-style-type: decimal }
-
-.doc_author { text-align: left; font-weight: bold; padding-left: 20pt }
-.doc_text { text-align: left; padding-left: 20pt; padding-right: 10pt }
-
-.doc_footer { text-align: left; padding: 0 0 0 0 }
-
-.doc_hilite { color: blue; font-weight: bold; }
-
-.doc_table { text-align: center; width: 90%;
- padding: 1px 1px 1px 1px; border: 1px; }
-
-.doc_table_nw { text-align: center; border: 1px;
- padding: 1px 1px 1px 1px; }
-
-.doc_warning { color: red; font-weight: bold }
-
-.literal-block { border: solid 1px gray; background: #eeeeee;
- margin: 0 1em 0 1em;
- padding: 1em 2em 1em 1em;
- display:table;
- }
-.doc_notes { background: #fafafa; border: 1px solid #cecece; padding: 0.1em }
-
-TABLE.layout { text-align: left; border: none; border-collapse: collapse;
- padding: 4px 4px 4px 4px; }
-TR.layout { border: none; padding: 4pt 4pt 2pt 2pt; }
-TD.layout { border: none; padding: 4pt 4pt 2pt 2pt;
- vertical-align: top;}
-TD.left { border: none; padding: 4pt 4pt 2pt 2pt; text-align: left;
- vertical-align: top;}
-TD.right { border: none; padding: 4pt 4pt 2pt 2pt; text-align: right;
- vertical-align: top;}
-TH.layout { border: none; font-weight: bold; font-size: 105%;
- text-align:center; vertical-align: middle; }
-
-/* Left align table cell */
-.td_left { border: 2px solid gray; text-align: left; }
-
-.toc-backref { color: black; text-decoration: none; }