Commit bceaa576 authored by Tim Mattox's avatar Tim Mattox
Browse files

Merge branch 'master' into USER-DPD_kokkos as of patch 31Mar17

parents 6ba59cb4 ae56b9ad
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ BUILDDIR = /tmp/lammps-docs-$(SHA1)
RSTDIR        = $(BUILDDIR)/rst
VENV          = $(BUILDDIR)/docenv
TXT2RST       = $(VENV)/bin/txt2rst
ANCHORCHECK   = $(VENV)/bin/doc_anchor_check

PYTHON        = $(shell which python3)
HAS_PYTHON3    = NO
@@ -50,7 +51,7 @@ clean:
clean-spelling:
	rm -rf spelling

html: $(OBJECTS)
html: $(OBJECTS) $(ANCHORCHECK)
	@(\
		. $(VENV)/bin/activate ;\
		cp -r src/* $(RSTDIR)/ ;\
@@ -131,7 +132,7 @@ fetch:

txt2html: utils/txt2html/txt2html.exe

anchor_check : $(TXT2RST)
anchor_check : $(ANCHORCHECK)
	@(\
		. $(VENV)/bin/activate ;\
		doc_anchor_check src/*.txt ;\
@@ -162,7 +163,7 @@ $(VENV):
		deactivate;\
	)

$(TXT2RST): $(VENV)
$(TXT2RST) $(ANCHORCHECK): $(VENV)
	@( \
		. $(VENV)/bin/activate; \
		(cd utils/converters;\
+5.49 KiB
Loading image diff...
+9 −0
Original line number Diff line number Diff line
\documentclass[12pt]{article}

\begin{document}

\begin{eqnarray*}
\mu &=&\mu^{id} + \mu^{ex}
\end{eqnarray*}

\end{document}
 No newline at end of file
+10.4 KiB
Loading image diff...
+10 −0
Original line number Diff line number Diff line
\documentclass[12pt]{article}

\begin{document}

\begin{eqnarray*}
\mu^{id} &=& k T \ln{\rho \Lambda^3} \\
&=& k T \ln{\frac{\phi P \Lambda^3}{k T}} 
\end{eqnarray*}

\end{document}
 No newline at end of file
Loading