合并分支 'master' 到 'caorunzhe'

Master

查看合并请求 !94

Chapter5/Figures/figure-human-translation.tex

@@ -10,7 +10,7 @@
 \node [anchor=west] (s3) at ([xshift=2em]s2.east) {{你}};
 \node [anchor=west] (s3) at ([xshift=2em]s2.east) {{你}};
 \node [anchor=west] (s4) at ([xshift=2em]s3.east) {{感到}};
 \node [anchor=west] (s4) at ([xshift=2em]s3.east) {{感到}};
 \node [anchor=west] (s5) at ([xshift=2em]s4.east) {{满意}};
 \node [anchor=west] (s5) at ([xshift=2em]s4.east) {{满意}};
-\node [anchor=south west] (sentlabel) at ([yshift=-0.5em]s1.north west) {\scriptsize{\sffamily\bfseries{\color{red}{待翻译句子(已经分词):}}}};
+\node [anchor=south west] (sentlabel) at ([yshift=-0.5em]s1.north west) {\scriptsize{\sffamily\bfseries{待翻译句子(已经分词):}}};
 
 
 {
 {
 \draw [->,very thick,ublue] (s1.south) -- ([yshift=-0.7em]s1.south);
 \draw [->,very thick,ublue] (s1.south) -- ([yshift=-0.7em]s1.south);

Chapter5/Figures/figure-process-of-machine-translation.tex

@@ -8,7 +8,7 @@
 \node [anchor=west] (s4) at ([xshift=2em]s3.east) {{感到}};
 \node [anchor=west] (s4) at ([xshift=2em]s3.east) {{感到}};
 \node [anchor=west] (s5) at ([xshift=2em]s4.east) {{满意}};
 \node [anchor=west] (s5) at ([xshift=2em]s4.east) {{满意}};
 
 
-\node [anchor=south west] (sentlabel) at ([yshift=-0.5em]s1.north west) {\scriptsize{{\color{red}{待翻译句子(已经分词):}}}};
+\node [anchor=south west] (sentlabel) at ([yshift=-0.5em]s1.north west) {\scriptsize{\sffamily\bfseries{待翻译句子(已经分词):}}};
 
 
 \draw [->,very thick,ublue] (s1.south) -- ([yshift=-0.7em]s1.south);
 \draw [->,very thick,ublue] (s1.south) -- ([yshift=-0.7em]s1.south);
 \draw [->,very thick,ublue] (s2.south) -- ([yshift=-0.7em]s2.south);
 \draw [->,very thick,ublue] (s2.south) -- ([yshift=-0.7em]s2.south);
@@ -202,8 +202,8 @@
 \node [anchor=west] (score1) at ([xshift=1.5em]ft14.east) {\footnotesize{P=0.042}};
 \node [anchor=west] (score1) at ([xshift=1.5em]ft14.east) {\footnotesize{P=0.042}};
 \node [anchor=west] (score2) at ([xshift=1.5em]ft24.east) {\footnotesize{P=0.006}};
 \node [anchor=west] (score2) at ([xshift=1.5em]ft24.east) {\footnotesize{P=0.006}};
 \node [anchor=west] (score3) at ([xshift=1.5em]ft34.east) {\footnotesize{P=0.003}};
 \node [anchor=west] (score3) at ([xshift=1.5em]ft34.east) {\footnotesize{P=0.003}};
-\node [anchor=south] (scorelabel) at ([xshift=-2.0em]score1.north) {\scriptsize{{\color{red}{率给每个译文赋予一个模型得分}}}};
-\node [anchor=south] (scorelabel2) at ([yshift=-0.5em]scorelabel.north) {\scriptsize{{\color{red}{系统综合单词概率和语言模型概}}}};
+\node [anchor=south] (scorelabel) at ([xshift=-2.0em]score1.north) {\scriptsize{{\color{black}{率给每个译文赋予一个模型得分}}}};
+\node [anchor=south] (scorelabel2) at ([yshift=-0.5em]scorelabel.north) {\scriptsize{{\color{black}{系统综合单词概率和语言模型概}}}};
 }
 }
 {
 {
 \node [anchor=north] (scorelabel2) at (score3.south) {\scriptsize{{选择得分}}};
 \node [anchor=north] (scorelabel2) at (score3.south) {\scriptsize{{选择得分}}};

Chapter5/Figures/figure-processes-smt.tex

@@ -22,10 +22,10 @@
 \node[rectangle,draw=ublue,thick,inner sep=0.2em,fill=white,drop shadow,minimum height=1.6cm] [fit = (P) (modellabel)] (model) {};
 \node[rectangle,draw=ublue,thick,inner sep=0.2em,fill=white,drop shadow,minimum height=1.6cm] [fit = (P) (modellabel)] (model) {};
 \end{pgfonlayer}
 \end{pgfonlayer}
 
 
-\draw [->,very thick,ublue] ([xshift=0.2em]corpus.east) -- ([xshift=4.2em]corpus.east)  node [pos=0.5, above] {\color{red}{\scriptsize{模型学习}}};
+\draw [->,very thick,ublue] ([xshift=0.2em]corpus.east) -- ([xshift=4.2em]corpus.east)  node [pos=0.5, above] {\color{black}{\scriptsize{训练}}};
 
 
 {
 {
-\draw [->,very thick,ublue] ([xshift=0.4em]model.east) -- ([xshift=4.4em]model.east)  node [inner sep=0pt,pos=0.5, above,yshift=0.3em] (decodingarrow) {\color{red}{\scriptsize{搜索\&计算}}};
+\draw [->,very thick,ublue] ([xshift=0.4em]model.east) -- ([xshift=4.4em]model.east)  node [inner sep=0pt,pos=0.5, above,yshift=0.3em] (decodingarrow) {\color{black}{\scriptsize{解码}}};
 
 
 {\scriptsize
 {\scriptsize
 \node [anchor=north west,inner sep=2pt] (sentlabel) at ([xshift=6.5em,yshift=-0.9em]model.north east) {{\color{ublue} \sffamily\bfseries{机器翻译引擎}}};
 \node [anchor=north west,inner sep=2pt] (sentlabel) at ([xshift=6.5em,yshift=-0.9em]model.north east) {{\color{ublue} \sffamily\bfseries{机器翻译引擎}}};

Chapter5/Figures/figure-role-of-p-in-sentence-level-translation.tex

@@ -22,9 +22,9 @@
 \node[rectangle,draw=ublue,thick,inner sep=0.2em,fill=white,drop shadow,minimum height=1.6cm] [fit = (P) (modellabel)] (model) {};
 \node[rectangle,draw=ublue,thick,inner sep=0.2em,fill=white,drop shadow,minimum height=1.6cm] [fit = (P) (modellabel)] (model) {};
 \end{pgfonlayer}
 \end{pgfonlayer}
 
 
-\draw [->,very thick,ublue] ([xshift=0.2em]corpus.east) -- ([xshift=3.0em]corpus.east)  node [inner sep=0pt,pos=0.5,above,yshift=0.3em] (trainingarrow) {\color{red}{\scriptsize{模型学习}}};
+\draw [->,very thick,ublue] ([xshift=0.2em]corpus.east) -- ([xshift=3.0em]corpus.east)  node [inner sep=0pt,pos=0.5,above,yshift=0.3em] (trainingarrow) {\color{black}{\scriptsize{训练}}};
 
 
-\draw [->,very thick,ublue] ([xshift=0.4em]model.east) -- ([xshift=3.4em]model.east)  node [inner sep=0pt,pos=0.5,above,yshift=0.3em] (decodingarrow) {\color{red}{\scriptsize{穷举\&计算}}};
+\draw [->,very thick,ublue] ([xshift=0.4em]model.east) -- ([xshift=3.4em]model.east)  node [inner sep=0pt,pos=0.5,above,yshift=0.3em] (decodingarrow) {\color{black}{\scriptsize{解码}}};
 
 
 {\scriptsize
 {\scriptsize
 \node [anchor=north west,inner sep=2pt] (sentlabel) at ([xshift=5.5em,yshift=-0.9em]model.north east) {{\color{ublue} \sffamily\bfseries{机器翻译引擎}}};
 \node [anchor=north west,inner sep=2pt] (sentlabel) at ([xshift=5.5em,yshift=-0.9em]model.north east) {{\color{ublue} \sffamily\bfseries{机器翻译引擎}}};

mt-book-xelatex.tex

@@ -132,10 +132,10 @@
 %----------------------------------------------------------------------------------------
 %----------------------------------------------------------------------------------------
 
 
 %\include{Chapter1/chapter1}
 %\include{Chapter1/chapter1}
-\include{Chapter2/chapter2}
+%\include{Chapter2/chapter2}
 %\include{Chapter3/chapter3}
 %\include{Chapter3/chapter3}
 %\include{Chapter4/chapter4}
 %\include{Chapter4/chapter4}
-%\include{Chapter5/chapter5}
+\include{Chapter5/chapter5}
 %\include{Chapter6/chapter6}
 %\include{Chapter6/chapter6}
 %\include{Chapter7/chapter7}
 %\include{Chapter7/chapter7}
 %\include{Chapter8/chapter8}
 %\include{Chapter8/chapter8}