diff --git a/Documentation/Doxyfile b/Documentation/Doxyfile index 4473428fb23..4e03416480a 100644 --- a/Documentation/Doxyfile +++ b/Documentation/Doxyfile @@ -942,13 +942,13 @@ HTML_EXTRA_STYLESHEET = # 180 is cyan, 240 is blue, 300 purple, and 360 is red again. # The allowed range is 0 to 359. -HTML_COLORSTYLE_HUE = 260 +HTML_COLORSTYLE_HUE = 220 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of # the colors in the HTML output. For a value of 0 the output will use # grayscales only. A value of 255 will produce the most vivid colors. -HTML_COLORSTYLE_SAT = 40 +HTML_COLORSTYLE_SAT = 100 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to # the luminance component of the colors in the HTML output. Values below @@ -957,7 +957,7 @@ HTML_COLORSTYLE_SAT = 40 # so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, # and 100 does not change the gamma. -HTML_COLORSTYLE_GAMMA = 90 +HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML # page will contain the date and time when the page was generated. Setting @@ -1533,7 +1533,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = DOXYGEN_RUNNING # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Documentation/cgal_stylesheet.css b/Documentation/cgal_stylesheet.css index cf1f3ad867a..db2f08ea219 100644 --- a/Documentation/cgal_stylesheet.css +++ b/Documentation/cgal_stylesheet.css @@ -52,6 +52,18 @@ h1.groupheader { font-size: 150%; } +/* enable this to make sections more alike */ +/* h2.groupheader { */ +/* border-bottom: none; */ +/* color: black; */ +/* font-size: 100%; */ +/* font-weight: bold; */ +/* margin-top: 1.75em; */ +/* padding-bottom: 0; */ +/* padding-top: 0; */ +/* width: 100%; */ +/* } */ + a.el { font-weight: normal; } diff --git a/Documentation/conceptify.py b/Documentation/conceptify.py index c53a7542c2f..0b8047bc5fe 100755 --- a/Documentation/conceptify.py +++ b/Documentation/conceptify.py @@ -41,6 +41,13 @@ def clean_doc(): duplicate_files=glob.glob('./output/CGAL.CGAL.*/html/jquery.js') duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/html/dynsections.js')) duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/html/stylesheet.css')) + # left-over by doxygen? + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/bib2xhtml.pl')) + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/cgal_manual.bib')) + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/citelist.doc')) + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/doxygen.bst')) + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/geom.bib')) + for fn in duplicate_files: os.remove(fn) diff --git a/Documentation/doxyassist.xml b/Documentation/doxyassist.xml index 0216712ff1d..4bd0796a054 100644 --- a/Documentation/doxyassist.xml +++ b/Documentation/doxyassist.xml @@ -716,11 +716,15 @@ namespace for the XML file to be processed properly. --> 3D Minkowski Sum of Polyhedra ../Minkowski_sum_3/doc/Minkowski_sum_3 + ../Minkowski_sum_3/include/ - ../Minkowski_sum_3/doc/Minkowski_sum_3/ + ../Minkowski_sum_3/include/ ./tags/Minkowski_sum_3.tag ../Minkowski_sum_3/examples ../Minkowski_sum_3/doc/Minkowski_sum_3/fig + true + true + false ./tags/Nef_3.tag=../../CGAL.CGAL.3D-Boolean-Operations-on-Nef-Polyhedra/html ./tags/Convex_decomposition_3.tag=../../CGAL.CGAL.Convex-Decomposition-of-Polyhedra/html @@ -1537,6 +1541,7 @@ namespace for the XML file to be processed properly. --> jquery.footnotes.min.js hacks.js + cgal_stylesheet.css diff --git a/Documentation/stylesheet.css b/Documentation/stylesheet.css index c22ba2785db..8e8ce4b8ef9 100644 --- a/Documentation/stylesheet.css +++ b/Documentation/stylesheet.css @@ -17,8 +17,8 @@ h1.groupheader { } h2.groupheader { - border-bottom: 1px solid #9C92AF; - color: #494159; + border-bottom: 1px solid #879ECB; + color: #354C7B; font-size: 150%; font-weight: normal; margin-top: 1.75em; @@ -88,8 +88,8 @@ h3.version { } div.qindex, div.navtab{ - background-color: #EEEDF2; - border: 1px solid #B2ABC1; + background-color: #EBEFF6; + border: 1px solid #A3B4D7; text-align: center; } @@ -105,13 +105,13 @@ div.navtab { /* @group Link Styling */ a { - color: #554B67; + color: #3D578C; font-weight: normal; text-decoration: none; } .contents a:visited { - color: #64597A; + color: #4665A2; } a:hover { @@ -124,9 +124,9 @@ a.qindex { a.qindexHL { font-weight: bold; - background-color: #ACA4BD; + background-color: #9CAFD4; color: #ffffff; - border: 1px double #9B91AE; + border: 1px double #869DCA; } .contents a.qindexHL:visited { @@ -170,8 +170,8 @@ pre.fragment { div.fragment { padding: 4px; margin: 4px; - background-color: #FCFBFC; - border: 1px solid #CEC9D7; + background-color: #FBFCFD; + border: 1px solid #C4CFE5; } div.line { @@ -264,9 +264,9 @@ div.contents { } td.indexkey { - background-color: #EEEDF2; + background-color: #EBEFF6; font-weight: bold; - border: 1px solid #CEC9D7; + border: 1px solid #C4CFE5; margin: 2px 0px 2px 0; padding: 2px 10px; white-space: nowrap; @@ -274,14 +274,14 @@ td.indexkey { } td.indexvalue { - background-color: #EEEDF2; - border: 1px solid #CEC9D7; + background-color: #EBEFF6; + border: 1px solid #C4CFE5; padding: 2px 10px; margin: 2px 0px; } tr.memlist { - background-color: #F0EFF3; + background-color: #EEF1F7; } p.formulaDsp { @@ -364,8 +364,8 @@ span.vhdllogic { } blockquote { - background-color: #F8F7F9; - border-left: 2px solid #ACA4BD; + background-color: #F7F8FB; + border-left: 2px solid #9CAFD4; margin: 0 24px 0 4px; padding: 0 12px 0 16px; } @@ -398,18 +398,18 @@ td.tiny { .dirtab { padding: 4px; border-collapse: collapse; - border: 1px solid #B2ABC1; + border: 1px solid #A3B4D7; } th.dirtab { - background: #EEEDF2; + background: #EBEFF6; font-weight: bold; } hr { height: 0px; border: none; - border-top: 1px solid #695E81; + border-top: 1px solid #4A6AAA; } hr.footer { @@ -444,7 +444,7 @@ table.memberdecls { .mdescLeft, .mdescRight, .memItemLeft, .memItemRight, .memTemplItemLeft, .memTemplItemRight, .memTemplParams { - background-color: #FAF9FB; + background-color: #F9FAFC; border: none; margin: 4px; padding: 1px 0 0 8px; @@ -471,7 +471,7 @@ table.memberdecls { } .memTemplParams { - color: #64597A; + color: #4665A2; white-space: nowrap; font-size: 80%; } @@ -484,14 +484,14 @@ table.memberdecls { .memtemplate { font-size: 80%; - color: #64597A; + color: #4665A2; font-weight: normal; margin-left: 9px; } .memnav { - background-color: #EEEDF2; - border: 1px solid #B2ABC1; + background-color: #EBEFF6; + border: 1px solid #A3B4D7; text-align: center; margin: 2px; margin-right: 15px; @@ -529,16 +529,16 @@ table.memberdecls { } .memproto, dl.reflist dt { - border-top: 1px solid #B6AFC5; - border-left: 1px solid #B6AFC5; - border-right: 1px solid #B6AFC5; + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; padding: 6px 0px 6px 0px; - color: #302B3B; + color: #253555; font-weight: bold; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); background-image:url('nav_f.png'); background-repeat:repeat-x; - background-color: #E7E4EB; + background-color: #E2E8F2; /* opera specific markup */ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); border-top-right-radius: 4px; @@ -555,11 +555,11 @@ table.memberdecls { } .memdoc, dl.reflist dd { - border-bottom: 1px solid #B6AFC5; - border-left: 1px solid #B6AFC5; - border-right: 1px solid #B6AFC5; + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; padding: 6px 10px 2px 10px; - background-color: #FCFBFC; + background-color: #FBFCFD; border-top-width: 0; background-image:url('nav_g.png'); background-repeat:repeat-x; @@ -646,11 +646,11 @@ span.mlabels { } span.mlabel { - background-color: #8B7FA2; - border-top:1px solid #73668C; - border-left:1px solid #73668C; - border-right:1px solid #CEC9D7; - border-bottom:1px solid #CEC9D7; + background-color: #728DC1; + border-top:1px solid #5373B4; + border-left:1px solid #5373B4; + border-right:1px solid #C4CFE5; + border-bottom:1px solid #C4CFE5; text-shadow: none; color: white; margin-right: 4px; @@ -707,7 +707,7 @@ div.directory { .directory tr.even { padding-left: 6px; - background-color: #F8F7F9; + background-color: #F7F8FB; } .directory img { @@ -725,7 +725,7 @@ div.directory { cursor: pointer; padding-left: 2px; padding-right: 2px; - color: #554B67; + color: #3D578C; } div.dynheader { @@ -740,7 +740,7 @@ div.dynheader { address { font-style: normal; - color: #383245; + color: #2A3D61; } table.doxtable { @@ -750,12 +750,12 @@ table.doxtable { } table.doxtable td, table.doxtable th { - border: 1px solid #3C364A; + border: 1px solid #2D4068; padding: 3px 7px 2px; } table.doxtable th { - background-color: #4C445D; + background-color: #374F7F; color: #FFFFFF; font-size: 110%; padding-bottom: 4px; @@ -765,7 +765,7 @@ table.doxtable th { table.fieldtable { width: 100%; margin-bottom: 10px; - border: 1px solid #B6AFC5; + border: 1px solid #A8B8D9; border-spacing: 0px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -781,13 +781,13 @@ table.fieldtable { .fieldtable td.fieldtype, .fieldtable td.fieldname { white-space: nowrap; - border-right: 1px solid #B6AFC5; - border-bottom: 1px solid #B6AFC5; + border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; vertical-align: top; } .fieldtable td.fielddoc { - border-bottom: 1px solid #B6AFC5; + border-bottom: 1px solid #A8B8D9; width: 100%; } @@ -806,9 +806,9 @@ table.fieldtable { .fieldtable th { background-image:url('nav_f.png'); background-repeat:repeat-x; - background-color: #E7E4EB; + background-color: #E2E8F2; font-size: 90%; - color: #302B3B; + color: #253555; padding-bottom: 4px; padding-top: 5px; text-align:left; @@ -818,7 +818,7 @@ table.fieldtable { -webkit-border-top-right-radius: 4px; border-top-left-radius: 4px; border-top-right-radius: 4px; - border-bottom: 1px solid #B6AFC5; + border-bottom: 1px solid #A8B8D9; } @@ -840,8 +840,8 @@ table.fieldtable { background-position: 0 -5px; height:30px; line-height:30px; - color:#9E94B1; - border:solid 1px #CCC7D6; + color:#8AA0CC; + border:solid 1px #C2CDE4; overflow:hidden; margin:0px; padding:0px; @@ -856,7 +856,7 @@ table.fieldtable { background-image:url('bc_s.png'); background-repeat:no-repeat; background-position:right; - color:#4A425A; + color:#364D7C; } .navpath li.navelem a @@ -865,7 +865,7 @@ table.fieldtable { display:block; text-decoration: none; outline: none; - color: #352F41; + color: #283A5D; font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); text-decoration: none; @@ -873,7 +873,7 @@ table.fieldtable { .navpath li.navelem a:hover { - color:#82769B; + color:#6884BD; } .navpath li.footer @@ -885,7 +885,7 @@ table.fieldtable { background-image:none; background-repeat:no-repeat; background-position:right; - color:#4A425A; + color:#364D7C; font-size: 8pt; } @@ -920,9 +920,9 @@ div.header { background-image:url('nav_h.png'); background-repeat:repeat-x; - background-color: #FAF9FB; + background-color: #F9FAFC; margin: 0px; - border-bottom: 1px solid #CEC9D7; + border-bottom: 1px solid #C4CFE5; } div.headertitle @@ -932,7 +932,7 @@ div.headertitle dl { - padding: 0 0 0 0; + padding: 0 0 0 10px; } /* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */ @@ -1041,7 +1041,7 @@ dl.section dd { padding: 0px; margin: 0px; width: 100%; - border-bottom: 1px solid #73668C; + border-bottom: 1px solid #5373B4; } .image @@ -1066,7 +1066,7 @@ dl.section dd { div.zoom { - border: 1px solid #A399B5; + border: 1px solid #90A5CE; } dl.citelist { @@ -1074,7 +1074,7 @@ dl.citelist { } dl.citelist dt { - color:#453D55; + color:#334975; float:left; font-weight:bold; margin-right:10px; @@ -1088,8 +1088,8 @@ dl.citelist dd { div.toc { padding: 14px 25px; - background-color: #F6F5F8; - border: 1px solid #DEDBE5; + background-color: #F4F6FA; + border: 1px solid #D8DFEE; border-radius: 7px 7px 7px 7px; float: right; height: auto; @@ -1107,7 +1107,7 @@ div.toc li { div.toc h3 { font: bold 12px/1.2 Arial,FreeSans,sans-serif; - color: #64597A; + color: #4665A2; border-bottom: 0 none; margin: 0; } @@ -1177,3 +1177,4 @@ tr.heading h2 { display:inline; } } +