Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #372

Merged
merged 6 commits into from
Jan 2, 2019
Merged

Dev #372

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
286 changes: 257 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,267 @@
auto
node_modules
package-lock.json
dist
.DS_Store
*~
dtx-style.sty
thuthesis.cls
thuthesis.cfg
thuthesis.pdf
main.pdf
shuji.pdf
*.hd

## Core latex/pdflatex auxiliary files:
*.aux
*.bak
*.lof
*.log
*.lot
*.fls
*.out
*.toc
*.fmt
*.fot
*.cb
*.cb2
.*.lb

## Intermediate documents:
*.dvi
*.xdv
*-converted-to.*
# these rules might exclude image files for figures etc.
# *.ps
# *.eps
# *.pdf

## Generated if empty string is given at "Please type another file name for output:"
.pdf

## Bibliography auxiliary files (bibtex/biblatex/biber):
*.bbl
*.bcf
*.blg
*.dvi
*-blx.aux
*-blx.bib
*.run.xml

## Build tool auxiliary files:
*.fdb_latexmk
*.synctex
*.synctex(busy)
*.synctex.gz
*.synctex.gz(busy)
*.pdfsync

## Build tool directories for auxiliary files
# latexrun
latex.out/

## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
*.loa

# achemso
acs-*.bib

# amsthm
*.thm

# beamer
*.nav
*.pre
*.snm
*.vrb

# changes
*.soc

# comment
*.cut

# cprotect
*.cpt

# elsarticle (documentclass of Elsevier journals)
*.spl

# endnotes
*.ent

# fixme
*.lox

# feynmf/feynmp
*.mf
*.mp
*.t[1-9]
*.t[1-9][0-9]
*.tfm

#(r)(e)ledmac/(r)(e)ledpar
*.end
*.?end
*.[1-9]
*.[1-9][0-9]
*.[1-9][0-9][0-9]
*.[1-9]R
*.[1-9][0-9]R
*.[1-9][0-9][0-9]R
*.eledsec[1-9]
*.eledsec[1-9]R
*.eledsec[1-9][0-9]
*.eledsec[1-9][0-9]R
*.eledsec[1-9][0-9][0-9]
*.eledsec[1-9][0-9][0-9]R

# glossaries
*.acn
*.acr
*.glg
*.glo
*.gls
*.glsdefs

# gnuplottex
*-gnuplottex-*

# gregoriotex
*.gaux
*.gtex

# htlatex
*.4ct
*.4tc
*.idv
*.lg
*.trc
*.xref

# hyperref
*.brf

# knitr
*-concordance.tex
# TODO Comment the next line if you want to keep your tikz graphics files
*.tikz
*-tikzDictionary

# listings
*.lol

# makeidx
*.idx
*.ilg
*.ind
*.ist
*.log
*.out
*.thm
*.toc
*.lof
*.lot

# minitoc
*.maf
*.mlf
*.mlt
*.mtc[0-9]*
*.slf[0-9]*
*.slt[0-9]*
*.stc[0-9]*

# minted
_minted*
*.pyg

# morewrites
*.mw

# nomencl
*.nlg
*.nlo
*.nls

# pax
*.pax

# pdfpcnotes
*.pdfpc

# sagetex
*.sagetex.sage
*.sagetex.py
*.sagetex.scmd

# scrwfile
*.wrt

# sympy
*.sout
*.sympy
sympy-plots-for-*.tex/

# pdfcomment
*.upa
*.upb

# pythontex
*.pytxcode
pythontex-files-*/

# tcolorbox
*.listing

# thmtools
*.loe
*.vrb
*.hd
*.fdb_latexmk
*.fls
*.synctex
*.synctex(busy)
*.synctex.gz
*.synctex.gz(busy)
*.xdv
dtx-style.sty
thuthesis.cls
thuthesis.cfg
thuthesis.pdf
main.pdf
shuji.pdf

# TikZ & PGF
*.dpth
*.md5
*.auxlock

# todonotes
*.tdo

# vhistory
*.hst
*.ver

# easy-todo
*.lod

# xcolor
*.xcp

# xmpincl
*.xmpi

# xindy
*.xdy

# xypic precompiled matrices
*.xyc

# endfloat
*.ttt
*.fff

# Latexian
TSWLatexianTemp*

## Editors:
# WinEdt
*.bak
*.sav

# Texpad
.texpadtmp

# LyX
*.lyx~

# Kile
*.backup

# KBibTeX
*~[0-9]*

# auto folder when using emacs and auctex
./auto/*
*.el

# expex forward references with \gathertags
*-tags.tex

# standalone packages
*.sta
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PACKAGE=thuthesis
SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
THESISCONTENTS=$(THESISMAIN).tex data/*.tex $(FIGURES)
# NOTE: update this to reflect your local file types.
FIGURES=$(wildcard figures/*.eps figures/*.pdf)
FIGURES=$(wildcard figures/*.pdf)
BIBFILE=ref/*.bib
BSTFILE=*.bst
SHUJICONTENTS=$(SHUJIMAIN).tex
Expand Down
4 changes: 2 additions & 2 deletions data/appendix01.tex
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ \subsection{Nonlinear Programming}
concerned with analyzing the structure of problems.
\begin{figure}[h]
\centering
\includegraphics{thu-lib-logo}
\includegraphics{thu-lib-logo.pdf}
\caption*{Figure~1\quad This is an example for manually numbered figure,
which would not appear in the list of figures}
\label{tab:badfigure2}
Expand Down Expand Up @@ -239,7 +239,7 @@ \subsection{非线性规划}
跖,为天下害,而弗能教也,丘窃为先生羞之。丘请为先生往说之。”
\begin{figure}[h]
\centering
\includegraphics{thu-whole-logo}
\includegraphics{thu-whole-logo.pdf}
\caption*{图~1\hskip1em 这是手动编号但不出现索引中的图片的例子}
\label{tab:badfigure3}
\end{figure}
Expand Down
14 changes: 7 additions & 7 deletions data/chap02.tex
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ \subsubsection{一个图形}
它提供了 \texttt{[H]} 参数,比如图~\ref{fig:xfig1}。
\begin{figure}[H] % use float package if you want it here
\centering
\includegraphics{thu-whole-logo}
\includegraphics{thu-whole-logo.pdf}
\caption{利用 Xfig 制图}
\label{fig:xfig1}
\end{figure}
Expand Down Expand Up @@ -64,22 +64,22 @@ \subsubsection{多个图形}
\begin{figure}[h]
\centering%
\subcaptionbox{第一个小图形\label{fig:subfig1}}[3cm] %标题的长度,超过则会换行,如下一个小图。
{\includegraphics[height=3cm]{thu-fig-logo}}%
{\includegraphics[height=3cm]{thu-fig-logo.pdf}}%
\hspace{4em}%
\subcaptionbox{第二个小图形,注意这个图略矮些。如果标题很长的话,它会自动换行\label{fig:subfig2}}
{\includegraphics[height=2cm]{thu-text-logo}}
{\includegraphics[height=2cm]{thu-text-logo.pdf}}
\caption{包含子图形的大图形(subcaptionbox示例)}
\label{fig:big1-subcaptionbox}
\end{figure}
\begin{figure}[h]
\centering%
\begin{subfigure}{3cm}
\includegraphics[height=3cm]{thu-fig-logo}
\includegraphics[height=3cm]{thu-fig-logo.pdf}
\caption{第一个小图形}
\end{subfigure}%
\hspace{4em}%
\begin{subfigure}{0.5\textwidth}
\includegraphics[height=2cm]{thu-text-logo}
\includegraphics[height=2cm]{thu-text-logo.pdf}
\caption{第二个小图形,注意这个图略矮些。subfigure中同一行的子图在顶端对齐。}
\end{subfigure}
\caption{包含子图形的大图形(subfigure示例)}
Expand All @@ -106,13 +106,13 @@ \subsubsection{多个图形}
\begin{figure}
\begin{minipage}{0.48\textwidth}
\centering
\includegraphics[height=2cm]{thu-whole-logo}
\includegraphics[height=2cm]{thu-whole-logo.pdf}
\caption{并排第一个图}
\label{fig:parallel1}
\end{minipage}\hfill
\begin{minipage}{0.48\textwidth}
\centering
\includegraphics[height=2cm]{thu-whole-logo}
\includegraphics[height=2cm]{thu-whole-logo.pdf}
\caption{并排第二个图}
\label{fig:parallel2}
\end{minipage}
Expand Down
Loading