summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author郭俊余 <hagbgreen@yahoo.com>2018-06-08 17:35:51 +0800
committerGitHub <noreply@github.com>2018-06-08 17:35:51 +0800
commit4868e8c65a17d33eded7f52ae7121ff6e6c08996 (patch)
tree4c70534a9de5b66e0f5460c45f3604faadac518c
parent2a838c711ed22e1b49b28c389d8da2289f85e7c6 (diff)
parentd3c3574bc082737ea9f4fee6c0e97ddefaef816d (diff)
downloadfsfs-zh-4868e8c65a17d33eded7f52ae7121ff6e6c08996.tar.xz
Merge pull request #3 from beijinglug/master
同步
-rwxr-xr-xMakefile10
-rw-r--r--docs/appendix-a.md2
-rw-r--r--docs/appendix-c.md2
-rw-r--r--docs/categories.md8
-rw-r--r--docs/code-en.svg86
-rw-r--r--docs/code-zh.svg86
-rw-r--r--docs/free-hardware-designs.md4
-rw-r--r--docs/free-software-even-more-important.md6
-rw-r--r--docs/government-free-software.md2
-rw-r--r--docs/why-gnu-linux.md2
-rwxr-xr-xinstall.latex.ubuntu.sh10
11 files changed, 197 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 897fbbb..89cf81e 100755
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,8 @@ CHAPTERS = docs/free-sw.md \
docs/surveillance-vs-democracy.md
APPENDIXS = docs/appendix-a.md \
docs/appendix-b.md \
- docs/appendix-c.md \
+ docs/appendix-c.md
+PDF_IMG = category.pdf code-zh.pdf song-book-jutta-scrunch-crop-zh.pdf
all: book html
@@ -71,6 +72,7 @@ clean:
rm *.tex *.aux *.fot *.toc *.log *.out
rm -fr fs-translations
rm *.png
+ rm $(PDF_IMG)
rm -r site
rm $(BOOKNAME).*
@@ -93,10 +95,14 @@ $(BOOKNAME).html: $(PREFACES) $(CHAPTERS) $(APPENDIXS)
pandoc $(TOC) --standalone --to=html5 -o $@ $^
mkdocs build --clean
-$(BOOKNAME).pdf: $(TITLE) $(PREFACES) $(CHAPTERS) $(APPENDIXS)
+%.pdf: docs/%.svg
+ rsvg-convert -f pdf -o $@ $<
+
+$(BOOKNAME).pdf: $(TITLE) $(PREFACES) $(CHAPTERS) $(APPENDIXS) $(PDF_IMG)
$(PANDOC_TEX) ${PREFACES} -o preface.tex
$(PANDOC_TEX) ${CHAPTERS} -o chapters.tex
$(PANDOC_TEX) ${APPENDIXS} -o appendix.tex
+ sed -i 's/\(\\includegraphics.*\)\.svg\}/\1.pdf}/g' chapters.tex appendix.tex
${call pdfgen}
# pandoc $(TOC) --latex-engine=xelatex -V documentclass=$(LATEX_CLASS) --template=$(TEMPLATE) -o $@ $^
rm -fr fs-translations
diff --git a/docs/appendix-a.md b/docs/appendix-a.md
index 91b50ad..c482436 100644
--- a/docs/appendix-a.md
+++ b/docs/appendix-a.md
@@ -10,7 +10,7 @@
程序最初的形态通常是*源代码*。这一系列高级指令由*编程语言*(比如 C 或者 Java)编写而成。之后会被一个名为*编译器*的工具编译为一种更底层的语言——*汇编语言*。另一种被称为*汇编器*的工具会将汇编代码分解为最终的*机器语言*——计算机可以*原生*理解的最底层代码。
-![计算机程序是如何从源代码生成二进制可执行文件的](code.png){ width=100% }
+![计算机程序是如何从源代码生成二进制可执行文件的](code-zh.svg){ width=100% }
例如,“Hello World”这个程序,通常是人们学习 C 语言时的第一个程序,编译和执行后会在屏幕上打印出“Hello World”[^ap-1]。
diff --git a/docs/appendix-c.md b/docs/appendix-c.md
index 316242e..43ff609 100644
--- a/docs/appendix-c.md
+++ b/docs/appendix-c.md
@@ -8,7 +8,7 @@
*译者注:读者可下载 Musescore 格式的乐谱文件[^apc-1],通过自由的乐谱软件 Musescore[^apc-2] 聆听。*
-![自由软件之歌乐谱](song-book-jutta-scrunch-crop-zh.png){ width=100% }
+![自由软件之歌乐谱](song-book-jutta-scrunch-crop-zh.svg){ width=100% }
[^apc-1]: 乐谱文件下载:<https://github.com/beijinglug/fsfs-zh/blob/master/docs/song-book-jutta-scrunch-crop-zh.mscx>
diff --git a/docs/categories.md b/docs/categories.md
index d2fb028..8b9a4c7 100644
--- a/docs/categories.md
+++ b/docs/categories.md
@@ -4,7 +4,7 @@
> 参见《应避免使用(或慎用)的词语,由于它们是不公正的或者引起混淆的》一文。
-![自由与非自由软件的分类](category-zh.png){ width=90% }
+![自由与非自由软件的分类](category.svg){ width=90% }
> 本图最初由 Chao-Kuei 创作并且经过其他人的更新,解释了不同类别的软件之间的区别。现有它的矢量图版,位于<http://gnu.org/philosophy/category.svg>以及 XFig 格式版本,位于<http://gnu.org/philosophy/category.fig>。本图采用 GNU 通用公共许可证(GNU GPL)2.0 或更高版本、GNU 自由文档许可证(GNU FDL)1.2 或更高版本、或者创作共用-署名-相同方式共享(CC BY-SA)许可证 2.0 或更高版本。
@@ -154,13 +154,13 @@ FSF 遵循这样的规则,我们不能在自己的计算机上安装任何私
[^cate-5]: 参见《X Windows 系统陷阱》。
- [^cate-6]: 参见 “The BSD License Problem,” 一文,位于<http://gnu.org/philosophy/bsd.html>。
+ [^cate-6]: 参见 “The BSD License Problem,” 一文,位于 <http://gnu.org/philosophy/bsd.html>。
- [^cate-7]: 参见 “Overview of the GNU System,” 一文,位于<http://gnu.org/gnu/gnu-history.html>以获知更多历史背景。
+ [^cate-7]: 参见 “Overview of the GNU System,” 一文,位于 <http://gnu.org/gnu/gnu-history.html> 以获知更多历史背景。
[^cate-8]: 参见《Linux 和 GNU 系统》一文以获得更多信息。
- [^cate-9]: 参见 “Overview of the GNU System,” 一文,位于<http://gnu.org/gnu/gnu-history.html>以获知更多历史背景。
+ [^cate-9]: 参见 “Overview of the GNU System,” 一文,位于 <http://gnu.org/gnu/gnu-history.html> 以获知更多历史背景。
[^cate-10]: 参见 <http://directory.fsf.org>。
diff --git a/docs/code-en.svg b/docs/code-en.svg
new file mode 100644
index 0000000..6833276
--- /dev/null
+++ b/docs/code-en.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ id="svg2"
+ width="501"
+ height="76"
+ viewBox="0 0 501 76">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <path
+ id="path8532-9"
+ d="M 4,1.5000001 V 74.5 H 82 V 1.5000001 Z m 134,0 V 74.5 h 78 V 1.5000001 Z m 143,0 V 74.5 h 83 V 1.5000001 Z m 139,0 V 74.5 h 77 V 1.5000001 Z m -414,2 H 80 V 72.5 H 6 Z m 134,0 h 74 V 72.5 h -74 z m 143,0 h 79 V 72.5 h -79 z m 139,0 h 73 V 72.5 H 422 Z M 15,23.5 v 2 h 55 v -2 z m 100.04297,0 c 3.95833,4 7.91667,8 11.875,12 H 92.480469 v 3 h 34.437501 c -3.95833,4 -7.91667,8 -11.875,12 h 3.99609 c 4.14714,-4.184892 8.29428,-8.36979 12.44141,-12.554687 V 36.052735 C 127.33405,31.867777 123.18652,27.683921 119.03906,23.5 Z m 139.51953,0 c 3.95833,4 7.91667,8 11.875,12 H 232 v 3 h 34.4375 c -3.95833,4 -7.91667,8 -11.875,12 h 3.99609 C 262.70573,46.315108 266.85287,42.13021 271,37.945313 V 36.052735 C 266.85358,31.867777 262.70605,27.683921 258.55859,23.5 Z m 141.64648,0 c 3.95833,4 7.91667,8 11.875,12 h -34.4375 v 3 h 34.4375 c -3.95833,4 -7.91667,8 -11.875,12 h 3.9961 c 4.14714,-4.184892 8.29427,-8.36979 12.4414,-12.554687 V 36.052735 C 408.50006,31.867777 404.35254,27.683921 400.20508,23.5 Z M 431,23.5 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z M 318,29 v 5 h -1.75586 c -0.82993,-1 -1.65835,-2 -2.48828,-3 h -2.4082 c -1.56575,1.666667 -3.12957,3.333333 -4.69532,5 1.56511,1.666667 3.13021,3.333333 4.69532,5 H 306 v 9 h 5 v 1.753907 l -3,2.490234 v 2.609375 c 1.77497,1.396188 3.54925,2.793265 5.32422,4.189453 1.43467,-1.347801 2.87002,-2.695168 4.30469,-4.042969 H 319 v 5 h 8 v -5 h 1.07031 c 1.68843,1.106299 3.37603,2.21206 5.06446,3.31836 l 5.26562,-5.263672 C 336.93375,53.493515 335.46665,51.932262 334,50.371094 V 49 h 6 v -8 h -6 v -1.755859 l 3,-2.490234 v -2.40625 c -1.66667,-1.565754 -3.33333,-3.131514 -5,-4.697266 -1.66667,1.565752 -3.33333,3.131512 -5,4.697266 V 29 Z m -147,1.5 v 5 h -1.75586 c -0.82993,-1 -1.65835,-2 -2.48828,-3 h -2.4082 c -1.56575,1.666667 -3.12957,3.333333 -4.69532,5 1.56511,1.666667 3.13021,3.333333 4.69532,5 H 159 v 9 h 5 v 1.753907 l -3,2.490234 v 2.609375 c 1.77497,1.396188 3.54925,2.793265 5.32422,4.189453 1.43467,-1.347801 2.87002,-2.695168 4.30469,-4.042969 H 172 v 5 h 8 v -5 h 1.07031 c 1.68843,1.106299 3.37603,2.21206 5.06446,3.31836 l 5.26562,-5.263672 C 189.93375,54.993515 188.46665,53.432262 187,51.871094 V 50.5 h 6 v -8 h -6 v -1.755859 l 3,-2.490234 v -2.40625 c -1.66667,-1.565754 -3.33333,-3.131514 -5,-4.697266 -1.66667,1.565752 -3.33333,3.131512 -5,4.697266 V 30.5 Z m -156,3 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z M 318.86523,39.59961 H 326 L 328.40039,42 v 7.134766 c -0.96667,0.611541 -1.93372,1.222443 -2.90039,1.833984 -2.12767,0.01068 -4.00598,0.02074 -6.09961,0.03125 L 317,48.59961 317.03125,42.5 Z m -147,1.5 H 179 L 181.40039,43.5 v 7.134766 c -0.96667,0.611541 -1.93372,1.222443 -2.90039,1.833984 -2.12767,0.01068 -4.00598,0.02074 -6.09961,0.03125 L 170,50.09961 170.03125,44 Z M 15,43.5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z"
+ style="fill:#000000" />
+ <text
+ id="text9209"
+ y="19.885723"
+ x="43.339935"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1px"
+ y="19.885723"
+ x="43.339935"
+ id="tspan9207">Source</tspan></text>
+ <text
+ id="text9209-0"
+ y="65.508919"
+ x="42.964859"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="65.508919"
+ x="42.964859"
+ id="tspan9229">Code</tspan></text>
+ <text
+ id="text9209-04"
+ y="20.547146"
+ x="177.41278"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="20.547146"
+ x="177.41278"
+ id="tspan9239">Compiler</tspan></text>
+ <text
+ id="text9209-00"
+ y="20.62376"
+ x="323.21588"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="20.62376"
+ x="323.21588"
+ id="tspan9249">Assembler</tspan></text>
+ <text
+ id="text9209-7"
+ y="19.189922"
+ x="458.25946"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="19.189922"
+ x="458.25946"
+ id="tspan9259">Machine</tspan></text>
+ <text
+ id="text9209-9"
+ y="65.509621"
+ x="460.23859"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="65.509621"
+ x="460.23859"
+ id="tspan9269">Code</tspan></text>
+</svg>
diff --git a/docs/code-zh.svg b/docs/code-zh.svg
new file mode 100644
index 0000000..7b5cc10
--- /dev/null
+++ b/docs/code-zh.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ id="svg2"
+ width="501"
+ height="76"
+ viewBox="0 0 501 76">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <path
+ id="path8532-9"
+ d="M 4,1.5000001 V 74.5 H 82 V 1.5000001 Z m 134,0 V 74.5 h 78 V 1.5000001 Z m 143,0 V 74.5 h 83 V 1.5000001 Z m 139,0 V 74.5 h 77 V 1.5000001 Z m -414,2 H 80 V 72.5 H 6 Z m 134,0 h 74 V 72.5 h -74 z m 143,0 h 79 V 72.5 h -79 z m 139,0 h 73 V 72.5 H 422 Z M 15,23.5 v 2 h 55 v -2 z m 100.04297,0 c 3.95833,4 7.91667,8 11.875,12 H 92.480469 v 3 h 34.437501 c -3.95833,4 -7.91667,8 -11.875,12 h 3.99609 c 4.14714,-4.184892 8.29428,-8.36979 12.44141,-12.554687 V 36.052735 C 127.33405,31.867777 123.18652,27.683921 119.03906,23.5 Z m 139.51953,0 c 3.95833,4 7.91667,8 11.875,12 H 232 v 3 h 34.4375 c -3.95833,4 -7.91667,8 -11.875,12 h 3.99609 C 262.70573,46.315108 266.85287,42.13021 271,37.945313 V 36.052735 C 266.85358,31.867777 262.70605,27.683921 258.55859,23.5 Z m 141.64648,0 c 3.95833,4 7.91667,8 11.875,12 h -34.4375 v 3 h 34.4375 c -3.95833,4 -7.91667,8 -11.875,12 h 3.9961 c 4.14714,-4.184892 8.29427,-8.36979 12.4414,-12.554687 V 36.052735 C 408.50006,31.867777 404.35254,27.683921 400.20508,23.5 Z M 431,23.5 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z M 318,29 v 5 h -1.75586 c -0.82993,-1 -1.65835,-2 -2.48828,-3 h -2.4082 c -1.56575,1.666667 -3.12957,3.333333 -4.69532,5 1.56511,1.666667 3.13021,3.333333 4.69532,5 H 306 v 9 h 5 v 1.753907 l -3,2.490234 v 2.609375 c 1.77497,1.396188 3.54925,2.793265 5.32422,4.189453 1.43467,-1.347801 2.87002,-2.695168 4.30469,-4.042969 H 319 v 5 h 8 v -5 h 1.07031 c 1.68843,1.106299 3.37603,2.21206 5.06446,3.31836 l 5.26562,-5.263672 C 336.93375,53.493515 335.46665,51.932262 334,50.371094 V 49 h 6 v -8 h -6 v -1.755859 l 3,-2.490234 v -2.40625 c -1.66667,-1.565754 -3.33333,-3.131514 -5,-4.697266 -1.66667,1.565752 -3.33333,3.131512 -5,4.697266 V 29 Z m -147,1.5 v 5 h -1.75586 c -0.82993,-1 -1.65835,-2 -2.48828,-3 h -2.4082 c -1.56575,1.666667 -3.12957,3.333333 -4.69532,5 1.56511,1.666667 3.13021,3.333333 4.69532,5 H 159 v 9 h 5 v 1.753907 l -3,2.490234 v 2.609375 c 1.77497,1.396188 3.54925,2.793265 5.32422,4.189453 1.43467,-1.347801 2.87002,-2.695168 4.30469,-4.042969 H 172 v 5 h 8 v -5 h 1.07031 c 1.68843,1.106299 3.37603,2.21206 5.06446,3.31836 l 5.26562,-5.263672 C 189.93375,54.993515 188.46665,53.432262 187,51.871094 V 50.5 h 6 v -8 h -6 v -1.755859 l 3,-2.490234 v -2.40625 c -1.66667,-1.565754 -3.33333,-3.131514 -5,-4.697266 -1.66667,1.565752 -3.33333,3.131512 -5,4.697266 V 30.5 Z m -156,3 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z M 318.86523,39.59961 H 326 L 328.40039,42 v 7.134766 c -0.96667,0.611541 -1.93372,1.222443 -2.90039,1.833984 -2.12767,0.01068 -4.00598,0.02074 -6.09961,0.03125 L 317,48.59961 317.03125,42.5 Z m -147,1.5 H 179 L 181.40039,43.5 v 7.134766 c -0.96667,0.611541 -1.93372,1.222443 -2.90039,1.833984 -2.12767,0.01068 -4.00598,0.02074 -6.09961,0.03125 L 170,50.09961 170.03125,44 Z M 15,43.5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z m -416,5 v 2 h 55 v -2 z m 416,0 v 2 h 55 v -2 z"
+ style="fill:#000000" />
+ <text
+ id="text9209"
+ y="19.885723"
+ x="43.339935"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1px"
+ y="19.885723"
+ x="43.339935"
+ id="tspan9207">源代码</tspan></text>
+ <text
+ id="text9209-0"
+ y="65.508919"
+ x="42.964859"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="65.508919"
+ x="42.964859"
+ id="tspan9229">代码</tspan></text>
+ <text
+ id="text9209-04"
+ y="20.547146"
+ x="177.41278"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="20.547146"
+ x="177.41278"
+ id="tspan9239">编译器</tspan></text>
+ <text
+ id="text9209-00"
+ y="20.62376"
+ x="323.21588"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="20.62376"
+ x="323.21588"
+ id="tspan9249">汇编器</tspan></text>
+ <text
+ id="text9209-7"
+ y="19.189922"
+ x="458.25946"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="19.189922"
+ x="458.25946"
+ id="tspan9259">机器</tspan></text>
+ <text
+ id="text9209-9"
+ y="65.509621"
+ x="460.23859"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.18533325px;line-height:125%;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="65.509621"
+ x="460.23859"
+ id="tspan9269">代码</tspan></text>
+</svg>
diff --git a/docs/free-hardware-designs.md b/docs/free-hardware-designs.md
index f4a7329..2ed69b4 100644
--- a/docs/free-hardware-designs.md
+++ b/docs/free-hardware-designs.md
@@ -139,7 +139,7 @@
[^freehard-1]: 参见《什么是自由软件?》以查看四项基本自由的列表。
- [^freehard-2]: 参见<http://gnu.org/philosophy/proprietary/proprietary-surveillance.html>以查看一个在工业中扩散的监视手段的快速增长的列表。
+ [^freehard-2]: 参见 <http://gnu.org/philosophy/proprietary/proprietary-surveillance.html> 以查看一个在工业中扩散的监视手段的快速增长的列表。
[^freehard-3]: 参见《为什么说开源漏掉了自由软件的要点》一文
@@ -158,7 +158,7 @@
[^freehard-10]: 参见美国版权局定义的“useful article”,于 <http://copyright.gov/register/va-useful.html>.
- [^freehard-11]: 一篇由 Public Knowledge 所写的文章“为你的 3D 打印产物赋予许可的三个步骤”<https://publicknowledge.org/assets/uploads/documents/3_Steps_for_Licensing_Your_3D_Printed_Stuff.pdf>(2015年3月6日)。对其在美国的复杂性给出了很有用的信息,尽管该文落入了使用伪概念“知识产权”,和不应该和版权联用的宣传用语“保护”的常见谬误。若问为何,参见《应避免使用(或慎用)的词语,由于它们是不公正的或者引起混淆的》一文。
+ [^freehard-11]: 一篇由 Public Knowledge 所写的文章“为你的 3D 打印产物赋予许可的三个步骤” <https://publicknowledge.org/assets/uploads/documents/3_Steps_for_Licensing_Your_3D_Printed_Stuff.pdf>(2015年3月6日)。对其在美国的复杂性给出了很有用的信息,尽管该文落入了使用伪概念“知识产权”,和不应该和版权联用的宣传用语“保护”的常见谬误。若问为何,参见《应避免使用(或慎用)的词语,由于它们是不公正的或者引起混淆的》一文。
[^freehard-12]: 参见《您说过“知识产权”吗?这是一种迷惑性的幻景》一文。
diff --git a/docs/free-software-even-more-important.md b/docs/free-software-even-more-important.md
index 1e1e2a2..3514a8a 100644
--- a/docs/free-software-even-more-important.md
+++ b/docs/free-software-even-more-important.md
@@ -88,15 +88,15 @@ SaaSS 并不意味着运行在服务器上的程序是非自由的(虽然大
我们以及上千用户从1984年开始就这么做,这样才有了现在我们使用的自由的 GNU/Linux 操作系统,所有人——无论是否是程序员——都可以使用。以一个程序员或活动家的身份,加入我们的事业。让我们一起解放所有计算机用户吧。
-[^fsemi-1]: 参见<http://gnu.org/proprietary/proprietary.html>可知这些不断增加的威胁。
+[^fsemi-1]: 参见 <http://gnu.org/proprietary/proprietary.html> 可知这些不断增加的威胁。
[^fsemi-2]: 自由软件的完整定义可参见《什么是自由软件》一文。
[^fsemi-3]: 参见《自由和非自由软件分类》一文中关于专有软件的脚注 1。
-[^fsemi-4]: 参见 Marcelo Rinesi 于2015年8月6日发表的文章"The Telemarketer Singularity"<http://ieet.org/index.php/IEET/more/rinesi20150806>
+[^fsemi-4]: 参见 Marcelo Rinesi 于2015年8月6日发表的文章"The Telemarketer Singularity" <http://ieet.org/index.php/IEET/more/rinesi20150806>
-[^fsemi-5]: 关于 GNU 操作系统的历史可参见《GNU 工程》一文,以及“GNU/Linux FAQ”<http://gnu.org/gnu/gnu-linux-faq.html>。
+[^fsemi-5]: 关于 GNU 操作系统的历史可参见《GNU 工程》一文,以及“GNU/Linux FAQ” <http://gnu.org/gnu/gnu-linux-faq.html>。
[^fsemi-6]: 参见《服务器真正为谁服务?》一文。
diff --git a/docs/government-free-software.md b/docs/government-free-software.md
index 7d43533..567b385 100644
--- a/docs/government-free-software.md
+++ b/docs/government-free-software.md
@@ -106,7 +106,7 @@
[^gov-1]: 参见《什么是自由软件?》一文了解自由软件的定义
-[^gov-2]: 参见反 DRM 活动网站[http://defectivebydesign.org/what_is_drm](http://defectivebydesign.org/what_is_drm)以及《应避免使用(或慎用)的词语》一文中有关 DRM 的章节了解相关问题。
+[^gov-2]: 参见反 DRM 活动网站 [http://defectivebydesign.org/what_is_drm](http://defectivebydesign.org/what_is_drm) 以及《应避免使用(或慎用)的词语》一文中有关 DRM 的章节了解相关问题。
[^gov-3]: 参见《服务器真正为谁服务?》一文的相关章节,了解 SaaSS。
diff --git a/docs/why-gnu-linux.md b/docs/why-gnu-linux.md
index 09e72fc..a03e2ea 100644
--- a/docs/why-gnu-linux.md
+++ b/docs/why-gnu-linux.md
@@ -42,4 +42,4 @@ GNU 工程是理想主义的,但是那些鼓励理想主义的人面临很大
[^whygnulinux-1]: 参见 Dietmar Muller 于 2001 年 7 月 10 日发表的文章《“Stallman: Love Is Not Free”》<http://zdnet.com/article/stallman-love-is-not-free/>
-[^whygnulinux-2]: 参见《“自由的桎梏——Java 陷阱”》<http://gnu.org/philosophy/java-trap.html>一文
+[^whygnulinux-2]: 参见《“自由的桎梏——Java 陷阱”》<http://gnu.org/philosophy/java-trap.html> 一文
diff --git a/install.latex.ubuntu.sh b/install.latex.ubuntu.sh
index 587a2b2..b70dc19 100755
--- a/install.latex.ubuntu.sh
+++ b/install.latex.ubuntu.sh
@@ -1,7 +1,5 @@
-sudo apt-get -y install texlive-xetex
-sudo apt-get -y install texlive-latex-recommended # main packages
-sudo apt-get -y install texlive-latex-extra texlive-lang-cjk # package titlesec and ctex
-sudo apt-get -y install texlive-fonts-recommended
-sudo apt-get -y install latex-cjk-chinese fonts-liberation ttf-liberation latex-cjk-chinese
-sudo apt-get -y install fonts-noto-cjk
+sudo apt-get -y install texlive-xetex texlive-latex-recommended \
+ texlive-latex-extra texlive-lang-cjk texlive-fonts-recommended \
+ latex-cjk-chinese fonts-liberation latex-cjk-chinese fonts-noto-cjk \
+ librsvg2-bin
sudo fc-cache