Merge branch 'doc/4.9' into docs-next

1 files changed, 35 insertions, 12 deletions

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 39b9c4a26f6e..46e69dba0e3c 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -34,7 +34,7 @@ from load_config import loadConfig
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include']
+extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']
 
 # The name of the math extension changed on Sphinx 1.4
 if minor > 3:
@@ -277,26 +277,46 @@ latex_elements = {
         % Allow generate some pages in landscape
         \\usepackage{lscape}
 
-        % Put notes in gray color and let them be inside a table
-
-        \\definecolor{MyGray}{rgb}{0.80,0.80,0.80}
-
-        \\makeatletter\\newenvironment{graybox}{%
-           \\begin{lrbox}{\\@tempboxa}\\begin{minipage}{\\columnwidth}}{\\end{minipage}\\end{lrbox}%
-           \\colorbox{MyGray}{\\usebox{\\@tempboxa}}
+        % Put notes in color and let them be inside a table
+        \\definecolor{NoteColor}{RGB}{204,255,255}
+        \\definecolor{WarningColor}{RGB}{255,204,204}
+        \\definecolor{AttentionColor}{RGB}{255,255,204}
+        \\definecolor{OtherColor}{RGB}{204,204,204}
+        \\newlength{\\mynoticelength}
+        \\makeatletter\\newenvironment{coloredbox}[1]{%
+           \\setlength{\\fboxrule}{1pt}
+           \\setlength{\\fboxsep}{7pt}
+           \\setlength{\\mynoticelength}{\\linewidth}
+           \\addtolength{\\mynoticelength}{-2\\fboxsep}
+           \\addtolength{\\mynoticelength}{-2\\fboxrule}
+           \\begin{lrbox}{\\@tempboxa}\\begin{minipage}{\\mynoticelength}}{\\end{minipage}\\end{lrbox}%
+           \\ifthenelse%
+              {\\equal{\\py@noticetype}{note}}%
+              {\\colorbox{NoteColor}{\\usebox{\\@tempboxa}}}%
+              {%
+                 \\ifthenelse%
+                 {\\equal{\\py@noticetype}{warning}}%
+                 {\\colorbox{WarningColor}{\\usebox{\\@tempboxa}}}%
+                 {%
+                    \\ifthenelse%
+                    {\\equal{\\py@noticetype}{attention}}%
+                    {\\colorbox{AttentionColor}{\\usebox{\\@tempboxa}}}%
+                    {\\colorbox{OtherColor}{\\usebox{\\@tempboxa}}}%
+                 }%
+              }%
         }\\makeatother
 
         \\makeatletter
-        \\renewenvironment{notice}[2]{
-          \\begin{graybox}
-          \\bf\\it
+        \\renewenvironment{notice}[2]{%
           \\def\\py@noticetype{#1}
+          \\begin{coloredbox}{#1}
+          \\bf\\it
           \\par\\strong{#2}
           \\csname py@noticestart@#1\\endcsname
         }
         {
           \\csname py@noticeend@\\py@noticetype\\endcsname
-          \\end{graybox}
+          \\end{coloredbox}
         }
         \\makeatother
 
@@ -306,6 +326,9 @@ latex_elements = {
         \\setromanfont{DejaVu Sans}
         \\setmonofont{DejaVu Sans Mono}
 
+        % To allow adjusting table sizes
+        \\usepackage{adjustbox}
+
      '''
 }