Merge branch 'master' into coulomb-refactoring (a31134a1) · Commits · 郑智淋 / lammps

doc/Makefile

+15 −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
		@@ -22,7 +23,7 @@ endif
		SOURCES=$(wildcard src/*.txt)
		OBJECTS=$(SOURCES:src/%.txt=$(RSTDIR)/%.rst)

		.PHONY: help clean-all clean epub html pdf old venv spelling
		.PHONY: help clean-all clean epub html pdf old venv spelling anchor_check

		# ------------------------------------------

		@@ -36,6 +37,7 @@ help:
		@echo " clean remove all intermediate RST files"
		@echo " clean-all reset the entire build environment"
		@echo " txt2html build txt2html tool"
		@echo " anchor_check scan for duplicate anchor labels"

		# ------------------------------------------

		@@ -49,11 +51,14 @@ clean:
		clean-spelling:
		rm -rf spelling

		html: $(OBJECTS)
		html: $(OBJECTS) $(ANCHORCHECK)
		@(\
		. $(VENV)/bin/activate ;\
		cp -r src/* $(RSTDIR)/ ;\
		sphinx-build -j 8 -b html -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
		echo "############################################" ;\
		doc_anchor_check src/*.txt ;\
		echo "############################################" ;\
		deactivate ;\
		)
		-rm html/searchindex.js
		@@ -127,6 +132,13 @@ fetch:

		txt2html: utils/txt2html/txt2html.exe

		anchor_check : $(ANCHORCHECK)
		@(\
		. $(VENV)/bin/activate ;\
		doc_anchor_check src/*.txt ;\
		deactivate ;\
		)

		# ------------------------------------------

		utils/txt2html/txt2html.exe: utils/txt2html/txt2html.cpp
		@@ -151,7 +163,7 @@ $(VENV):
		deactivate;\
		)

		$(TXT2RST): $(VENV)
		$(TXT2RST) $(ANCHORCHECK): $(VENV)
		@( \
		. $(VENV)/bin/activate; \
		(cd utils/converters;\

doc/src/Eqs/fix_gcmc1.jpg

0 → 100644

+5.49 KiB

Loading image diff...

doc/src/Eqs/fix_gcmc1.tex

0 → 100644

+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

doc/src/Eqs/fix_gcmc2.jpg

0 → 100644

+10.4 KiB

Loading image diff...

doc/src/Eqs/fix_gcmc2.tex

0 → 100644

+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

Admin message