Skip to content
Permalink
Browse files

Merge pull request #12997 from aeslaughter/MOOSEDocs-fixes-9638

MOOSEDocs Fixes
  • Loading branch information...
aeslaughter committed Mar 7, 2019
2 parents 405f084 + 3bca10b commit 077b81b7da92d1ff0cd0f1eabac6c6a6cabab1a1
@@ -83,11 +83,10 @@ def defaultSettings():
def createToken(self, parent, info, page):

flt = floats.create_float(parent, self.extension, self.reader, page, self.settings,
bottom=True)
bottom=True, **self.attributes)
img = Image(flt, src=info['subcommand'], tex=self.settings['latex_src'])
if flt is parent:
img.attributes.update(**self.attributes)

return parent

class VideoCommand(command.CommandComponent):
@@ -115,7 +115,8 @@ def defaultSettings():

def createToken(self, parent, info, page):
content = info['inline'] if 'inline' in info else info['block']
content = re.sub(r'__(?P<package>[A-Z_]+)__', self.subFunction, content, flags=re.UNICODE)
content = re.sub(r'__(?P<package>[A-Z][A-Z_]+)__', self.subFunction, content,
flags=re.UNICODE)
core.Code(parent, style="max-height:{};".format(self.settings['max-height']),
language=self.settings['language'], content=content)
return parent
@@ -1 +1 @@
<!DOCTYPE html><head><link href="../contrib/katex/katex.min.css" rel="stylesheet" type="text/css"></link><link href="../css/katex_moose.css" rel="stylesheet" type="text/css"></link><script src="../contrib/katex/katex.min.js" type="text/javascript"></script></head><body><h1 id="config-extension">Config Extension</h1><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Flag 1: </span><span class="moose-caption-text">Michigan</span></p><img src="../large_media/testing/Flag_of_Michigan.svg"></img></div></body><script src="../contrib/plotly/plotly.min.js" type="text/javascript"></script>
<!DOCTYPE html><head><link href="../contrib/katex/katex.min.css" rel="stylesheet" type="text/css"></link><link href="../css/katex_moose.css" rel="stylesheet" type="text/css"></link><script src="../contrib/katex/katex.min.js" type="text/javascript"></script></head><body><h1 id="config-extension">Config Extension</h1><div style="width:50%;text-align:center;" class="moose-float-div" id="michigan-flag"><p class="moose-caption"><span class="moose-caption-heading">Flag 1: </span><span class="moose-caption-text">Michigan</span></p><img src="../large_media/testing/Flag_of_Michigan.svg"></img></div></body><script src="../contrib/plotly/plotly.min.js" type="text/javascript"></script>
@@ -1 +1 @@
<!DOCTYPE html><head><link href="../contrib/katex/katex.min.css" rel="stylesheet" type="text/css"></link><link href="../css/katex_moose.css" rel="stylesheet" type="text/css"></link><script src="../contrib/katex/katex.min.js" type="text/javascript"></script></head><body><h1 id="media-extension">Media Extension</h1><img src="../large_media/testing/Flag_of_Michigan.svg" style="width:75%;text-align:center;"></img><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-text">Washington state flag.</span></p><img src="../large_media/testing/Flag_of_Washington.svg"></img></div><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Figure 1: </span><span class="moose-caption-text">Montana state flag.</span></p><img src="../large_media/testing/Flag_of_Montana.svg"></img></div><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Figure 2: </span><span class="moose-caption-text">New York state flag.</span></p><img src="../large_media/testing/Flag_of_New_York.svg"></img></div><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Flag 1: </span><span class="moose-caption-text">Idaho state flag.</span></p><img src="../large_media/testing/Flag_of_Idaho.svg"></img></div><p>Montana: <a href="#montana-flag">Figure 1</a></p><p>New York: <a href="#newyork-flag">Figure 2</a></p><p>Idaho: <a href="#idaho-flag">Flag 1</a></p><h2 id="width">Width</h2><img src="../large_media/testing/Flag_of_Michigan.svg" style="width:15%;text-align:center;"></img><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-text">Width is set to 15%</span></p><img src="../large_media/testing/Flag_of_Michigan.svg"></img></div><h2 id="videos">Videos</h2><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Figure 3: </span><span class="moose-caption-text">Big Bug Bunny is an open-source movie short.</span></p><video src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Big_Buck_Bunny_4K.webm" controls="controls" width="100%"><source src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Big_Buck_Bunny_4K.webm" type_="video/webm"></source></video></div></body><script src="../contrib/plotly/plotly.min.js" type="text/javascript"></script>
<!DOCTYPE html><head><link href="../contrib/katex/katex.min.css" rel="stylesheet" type="text/css"></link><link href="../css/katex_moose.css" rel="stylesheet" type="text/css"></link><script src="../contrib/katex/katex.min.js" type="text/javascript"></script></head><body><h1 id="media-extension">Media Extension</h1><img src="../large_media/testing/Flag_of_Michigan.svg" style="width:75%;text-align:center;"></img><div style="width:75%;text-align:center;" class="moose-float-div"><p class="moose-caption"><span class="moose-caption-text">Washington state flag.</span></p><img src="../large_media/testing/Flag_of_Washington.svg"></img></div><div style="width:75%;" class="moose-float-div" id="montana-flag"><p class="moose-caption"><span class="moose-caption-heading">Figure 1: </span><span class="moose-caption-text">Montana state flag.</span></p><img src="../large_media/testing/Flag_of_Montana.svg"></img></div><div style="width:75%;text-align:center;" class="moose-float-div" id="newyork-flag"><p class="moose-caption"><span class="moose-caption-heading">Figure 2: </span><span class="moose-caption-text">New York state flag.</span></p><img src="../large_media/testing/Flag_of_New_York.svg"></img></div><div style="width:75%;text-align:center;" class="moose-float-div" id="idaho-flag"><p class="moose-caption"><span class="moose-caption-heading">Flag 1: </span><span class="moose-caption-text">Idaho state flag.</span></p><img src="../large_media/testing/Flag_of_Idaho.svg"></img></div><p>Montana: <a href="#montana-flag">Figure 1</a></p><p>New York: <a href="#newyork-flag">Figure 2</a></p><p>Idaho: <a href="#idaho-flag">Flag 1</a></p><h2 id="width">Width</h2><img src="../large_media/testing/Flag_of_Michigan.svg" style="width:15%;text-align:center;"></img><div style="width:15%;" class="moose-float-div"><p class="moose-caption"><span class="moose-caption-text">Width is set to 15%</span></p><img src="../large_media/testing/Flag_of_Michigan.svg"></img></div><h2 id="videos">Videos</h2><div class="moose-float-div"><p class="moose-caption"><span class="moose-caption-heading">Figure 3: </span><span class="moose-caption-text">Big Bug Bunny is an open-source movie short.</span></p><video src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Big_Buck_Bunny_4K.webm" controls="controls" width="100%"><source src="https://upload.wikimedia.org/wikipedia/commons/c/c0/Big_Buck_Bunny_4K.webm" type_="video/webm"></source></video></div></body><script src="../contrib/plotly/plotly.min.js" type="text/javascript"></script>
@@ -42,9 +42,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "michigan-flag",
"img": false,
"recursive": true
"recursive": true,
"style": "width:50%;text-align:center;"
},
"children": [
{
@@ -54,9 +54,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "",
"img": false,
"recursive": true
"recursive": true,
"style": "width:75%;text-align:center;"
},
"children": [
{
@@ -133,9 +136,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "montana-flag",
"img": false,
"recursive": true
"recursive": true,
"style": "width:75%;"
},
"children": [
{
@@ -212,9 +218,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "newyork-flag",
"img": false,
"recursive": true
"recursive": true,
"style": "width:75%;text-align:center;"
},
"children": [
{
@@ -307,9 +316,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "idaho-flag",
"img": false,
"recursive": true
"recursive": true,
"style": "width:75%;text-align:center;"
},
"children": [
{
@@ -563,9 +575,12 @@
{
"attributes": {
"bottom": true,
"class": "",
"command": "figure",
"id": "",
"img": false,
"recursive": true
"recursive": true,
"style": "width:15%;"
},
"children": [
{
@@ -1,5 +1,5 @@

\chapter{\label{config-extension}Config Extension}
\begin{figure}
\caption{\label{michigan-flag}Michigan}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Michigan.pdf}
\centering\caption{\label{michigan-flag}Michigan}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Michigan.pdf}
\end{figure}
@@ -5,19 +5,19 @@ \chapter{\label{media-extension}Media Extension}
\end{center}
\begin{figure}
\caption{Washington state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Washington.pdf}
\centering\caption{Washington state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Washington.pdf}
\end{figure}
\begin{figure}
\caption{\label{montana-flag}Montana state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Montana.pdf}
\end{figure}
\begin{figure}
\caption{\label{newyork-flag}New York state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_New_York.pdf}
\centering\caption{\label{newyork-flag}New York state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_New_York.pdf}
\end{figure}
\begin{figure}
\caption{\label{idaho-flag}Idaho state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Idaho.pdf}
\centering\caption{\label{idaho-flag}Idaho state flag.}\includegraphics{${MOOSE_DIR}/python/MooseDocs/test/output/latex/large_media/testing/Flag_of_Idaho.pdf}
\end{figure}
\par Montana: Figure~\ref{montana-flag}
Oops, something went wrong.

0 comments on commit 077b81b

Please sign in to comment.
You can’t perform that action at this time.