From 1f4bcf8a7a23cd2ea687e3a197f65508b4d1b919 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 12:58:17 +0800 Subject: [PATCH 01/12] Create markdown-cn.html.markdown initiate --- zh-cn/markdown-cn.html.markdown | 246 ++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 zh-cn/markdown-cn.html.markdown diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown new file mode 100644 index 00000000..9a863bac --- /dev/null +++ b/zh-cn/markdown-cn.html.markdown @@ -0,0 +1,246 @@ +--- +language: markdown +contributors: + - ["Dan Turkel", "http://danturkel.com/"] +filename: markdown.md +--- + +Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well). + +Give me as much feedback as you want! / Feel free to fork and pull request! + + +``` + + + + + + +# This is an

+## This is an

+### This is an

+#### This is an

+##### This is an

+###### This is an
+ + +This is an h1 +============= + +This is an h2 +------------- + + + + +*This text is in italics.* +_And so is this text._ + +**This text is in bold.** +__And so is this text.__ + +***This text is in both.*** +**_As is this!_** +*__And this!__* + + + +~~This text is rendered with strikethrough.~~ + + + +This is a paragraph. I'm typing in a paragraph isn't this fun? + +Now I'm in paragraph 2. +I'm still in paragraph 2 too! + + +I'm in paragraph three! + + + +I end with two spaces (highlight me to see them). + +There's a
above me! + + + +> This is a block quote. You can either +> manually wrap your lines and put a `>` before every line or you can let your lines get really long and wrap on their own. +> It doesn't make a difference so long as they start with a `>`. + +> You can also use more than one level +>> of indentation? +> How neat is that? + + + + +* Item +* Item +* Another item + +or + ++ Item ++ Item ++ One more item + +or + +- Item +- Item +- One last item + + + +1. Item one +2. Item two +3. Item three + + + +1. Item one +1. Item two +1. Item three + + + + +1. Item one +2. Item two +3. Item three + * Sub-item + * Sub-item +4. Item four + + + + + This is code + So is this + + + + my_array.each do |item| + puts item + end + + + +John didn't even know what the `go_to()` function did! + + + +\`\`\`ruby +def foobar + puts "Hello world!" +end +\`\`\` + +<-- The above text doesn't require indenting, plus Github will use syntax +highlighting of the language you specify after the ``` --> + + + + +*** +--- +- - - +**************** + + + + +[Click me!](http://test.com/) + + + +[Click me!](http://test.com/ "Link to Test.com") + + + +[Go to music](/music/). + + + +[Click this link][link1] for more info about it! +[Also check out this link][foobar] if you want to. + +[link1]: http://test.com/ "Cool!" +[foobar]: http://foobar.biz/ "Alright!" + + + + + +[This][] is a link. + +[this]: http://thisisalink.com/ + + + + + + +![This is hover-text (alt text) for my image](http://imgur.com/myimage.jpg "An optional title") + + + +![This is the hover-text.][myimage] + +[myimage]: relative/urls/cool/image.jpg "if you need a title, it's here" + + + + + is equivalent to +[http://testwebsite.com/](http://testwebsite.com/) + + + + + + + +I want to type *this text surrounded by asterisks* but I don't want it to be +in italics, so I do this: \*this text surrounded by asterisks\*. + + + + +| Col1 | Col2 | Col3 | +| :----------- | :------: | ------------: | +| Left-aligned | Centered | Right-aligned | +| blah | blah | blah | + + + +Col 1 | Col2 | Col3 +:-- | :-: | --: +Ugh this is so ugly | make it | stop + + + +``` + +For more info, check out John Gruber's official post of syntax [here](http://daringfireball.net/projects/markdown/syntax) and Adam Pritchard's great cheatsheet [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). From 1e18c52f615c05343de77edf0ce364b9c3437764 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 13:00:39 +0800 Subject: [PATCH 02/12] Updated the file head --- zh-cn/markdown-cn.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 9a863bac..68f2e909 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -2,7 +2,10 @@ language: markdown contributors: - ["Dan Turkel", "http://danturkel.com/"] +translators: + - ["Fangzhou Chen", "http://binarythink.net"] filename: markdown.md +lang: zh-cn --- Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well). From 62e5ab350acd1803dea8f52ffd5b437c04cf7f84 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 13:01:14 +0800 Subject: [PATCH 03/12] Update markdown-cn.html.markdown --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 68f2e909..1e463287 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -3,7 +3,7 @@ language: markdown contributors: - ["Dan Turkel", "http://danturkel.com/"] translators: - - ["Fangzhou Chen", "http://binarythink.net"] + - ["Fangzhou Chen"] filename: markdown.md lang: zh-cn --- From 821464185ac044a0812584ac794049947d25b736 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 13:24:22 +0800 Subject: [PATCH 04/12] 2nd para --- zh-cn/markdown-cn.html.markdown | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 1e463287..f27722ba 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -8,17 +8,16 @@ filename: markdown.md lang: zh-cn --- -Markdown was created by John Gruber in 2004. It's meant to be an easy to read and write syntax which converts easily to HTML (and now many other formats as well). +Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的语法结构,并可以便利地转换成HTML(以及其他很多)格式。 -Give me as much feedback as you want! / Feel free to fork and pull request! +欢迎您多多反馈以及分支和请求合并。 ``` - + - + - - -# This is an

-## This is an

-### This is an

-#### This is an

-##### This is an

-###### This is an
+ + +# 这是一个

+## 这是一个

+### 这是一个

+#### 这是一个

+##### 这是一个

+###### 这是一个
- -This is an h1 + +这是一个 h1 ============= -This is an h2 +这是一个 h2 ------------- - - + + -*This text is in italics.* -_And so is this text._ +*此文本为斜体。* +_此文本也是。_ -**This text is in bold.** -__And so is this text.__ +**此文本为粗体。** +__此文本也是__ -***This text is in both.*** -**_As is this!_** -*__And this!__* +***此文本是斜体加粗体。*** +**_或者这样。_** +*__这个也是!__* - + -~~This text is rendered with strikethrough.~~ +~~此文本为删除线效果。~~ - + -This is a paragraph. I'm typing in a paragraph isn't this fun? +这是第一段落. 这句话在同一个段落里,好玩么? -Now I'm in paragraph 2. -I'm still in paragraph 2 too! +现在我是第二段落。 +这句话也在第二段落! +这句话在第三段落! -I'm in paragraph three! + - +此段落结尾有两个空格(选中以显示)。 -I end with two spaces (highlight me to see them). +上文有一个
! -There's a
above me! + - +> 这是一个段落引用. 你可以 +> 手动断开你的句子,然后在每句句子前面添加 “>” 字符。或者让你的句子变得很长,以至于他们自动得断开。 +> 只要你的文字以“>” 字符开头,两种方式无异。 -> This is a block quote. You can either -> manually wrap your lines and put a `>` before every line or you can let your lines get really long and wrap on their own. -> It doesn't make a difference so long as they start with a `>`. +> 你也对文本进行 +>> 多层引用 +> 这多机智啊! -> You can also use more than one level ->> of indentation? -> How neat is that? + + - - +* 项目 +* 项目 +* 另一个项目 -* Item -* Item -* Another item +或者 -or ++ 项目 ++ 项目 ++ 另一个项目 -+ Item -+ Item -+ One more item +或者 -or +- 项目 +- 项目 +- 最后一个项目 -- Item -- Item -- One last item + - +1. 项目一 +2. 项目二 +3. 项目三 -1. Item one -2. Item two -3. Item three + - +1. 项目一 +1. 项目二 +1. 项目三 + -1. Item one -1. Item two -1. Item three - + - +1. 项目一 +2. 项目二 +3. 项目三 + * 子项目 + * 子项目 +4. 项目四 -1. Item one -2. Item two -3. Item three - * Sub-item - * Sub-item -4. Item four - - - + + This is code So is this - + my_array.each do |item| puts item end - + John didn't even know what the `go_to()` function did! From e98b62883cd0ef08d72a9da5384df7f5402cb180 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 16:55:29 +0800 Subject: [PATCH 06/12] Finally Done --- zh-cn/markdown-cn.html.markdown | 115 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 4f4b4c51..5de5f75b 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -19,10 +19,13 @@ Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的 并不会被Markdown解析器所影响。不过如果你在Markdown文件内创建了HTML元素, 你将无法在HTML元素的内容中使用Markdown语法。--> - + - + + # 这是一个

## 这是一个

### 这是一个

@@ -54,7 +57,7 @@ __此文本也是__ ~~此文本为删除线效果。~~ - + 这是第一段落. 这句话在同一个段落里,好玩么? @@ -70,7 +73,7 @@ __此文本也是__ 上文有一个
! - + > 这是一个段落引用. 你可以 > 手动断开你的句子,然后在每句句子前面添加 “>” 字符。或者让你的句子变得很长,以至于他们自动得断开。 @@ -105,7 +108,8 @@ __此文本也是__ 2. 项目二 3. 项目三 - + 1. 项目一 1. 项目二 @@ -122,7 +126,8 @@ __此文本也是__ 4. 项目四 - + This is code So is this @@ -135,105 +140,101 @@ __此文本也是__ -John didn't even know what the `go_to()` function did! +John 甚至不知道 `go_to()` 方程是干嘛的! - + -\`\`\`ruby +\`\`\`ruby def foobar puts "Hello world!" end -\`\`\` +\`\`\` -<-- The above text doesn't require indenting, plus Github will use syntax -highlighting of the language you specify after the ``` --> + - - + + *** --- - - - **************** - - + + -[Click me!](http://test.com/) +[点我点我!](http://test.com/) - + -[Click me!](http://test.com/ "Link to Test.com") +[点我点我!](http://test.com/ "连接到Test.com") - + -[Go to music](/music/). +[去 music](/music/). - + -[Click this link][link1] for more info about it! -[Also check out this link][foobar] if you want to. +[点此链接][link1]以获取更多信息! +[看一看这个链接][foobar] 如果你愿意的话. [link1]: http://test.com/ "Cool!" [foobar]: http://foobar.biz/ "Alright!" - + - + [This][] is a link. [this]: http://thisisalink.com/ - + - - + + -![This is hover-text (alt text) for my image](http://imgur.com/myimage.jpg "An optional title") +![这是我图像的悬停文本(alt text)](http://imgur.com/myimage.jpg "可选命名") - + -![This is the hover-text.][myimage] +![这是我的悬停文本.][myimage] -[myimage]: relative/urls/cool/image.jpg "if you need a title, it's here" +[myimage]: relative/urls/cool/image.jpg "在此输入标题" - - + + - is equivalent to -[http://testwebsite.com/](http://testwebsite.com/) + 与 +[http://testwebsite.com/](http://testwebsite.com/) 等同 - + - + -I want to type *this text surrounded by asterisks* but I don't want it to be -in italics, so I do this: \*this text surrounded by asterisks\*. +我希望 *将这段文字置于星号之间* 但是我不希望它被 +斜体化, 所以我就: \*这段置文字于星号之间\*。 - - + + -| Col1 | Col2 | Col3 | -| :----------- | :------: | ------------: | -| Left-aligned | Centered | Right-aligned | -| blah | blah | blah | +| 第一列 | 第二列 | 第三列 | +| :---------- | :------: | ---------: | +| 左对齐 | 居个中 | 右对齐 | +| 某某某 | 某某某 | 某某某 | - + -Col 1 | Col2 | Col3 +第一列 | 第二列 | 第三列 :-- | :-: | --: -Ugh this is so ugly | make it | stop +这太丑了 | 药不能 | 停 - + ``` -For more info, check out John Gruber's official post of syntax [here](http://daringfireball.net/projects/markdown/syntax) and Adam Pritchard's great cheatsheet [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). +更多信息, 请见John Gruber 关于语法的官方帖子[此处](http://daringfireball.net/projects/markdown/syntax)以及 Adam Pritchard 的摘要笔记 [此处](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). From fd010c57e08336d108d979ecad9a82ef30980ed3 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 17:01:22 +0800 Subject: [PATCH 07/12] Proofread and checked style --- zh-cn/markdown-cn.html.markdown | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 5de5f75b..f82ebcea 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -1,25 +1,25 @@ --- -language: markdown +language: Markdown contributors: - ["Dan Turkel", "http://danturkel.com/"] translators: - ["Fangzhou Chen"] -filename: markdown.md +filename: Markdown.md lang: zh-cn --- -Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的语法结构,并可以便利地转换成HTML(以及其他很多)格式。 +Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的语法结构,并可以便利地转换成 HTML(以及其他很多)格式。 欢迎您多多反馈以及分支和请求合并。 ``` - + - @@ -41,7 +41,7 @@ Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的 ------------- - + *此文本为斜体。* _此文本也是。_ @@ -53,7 +53,7 @@ __此文本也是__ **_或者这样。_** *__这个也是!__* - + ~~此文本为删除线效果。~~ @@ -66,7 +66,7 @@ __此文本也是__ 这句话在第三段落! - 此段落结尾有两个空格(选中以显示)。 @@ -108,7 +108,7 @@ __此文本也是__ 2. 项目二 3. 项目三 - 1. 项目一 @@ -126,7 +126,7 @@ __此文本也是__ 4. 项目四 - This is code @@ -150,7 +150,7 @@ def foobar end \`\`\` - + @@ -161,7 +161,7 @@ end **************** - [点我点我!](http://test.com/) @@ -220,10 +220,10 @@ end 斜体化, 所以我就: \*这段置文字于星号之间\*。 - + | 第一列 | 第二列 | 第三列 | -| :---------- | :------: | ---------: | +| :---------- | :------: | ----------: | | 左对齐 | 居个中 | 右对齐 | | 某某某 | 某某某 | 某某某 | @@ -237,4 +237,4 @@ end ``` -更多信息, 请见John Gruber 关于语法的官方帖子[此处](http://daringfireball.net/projects/markdown/syntax)以及 Adam Pritchard 的摘要笔记 [此处](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). +更多信息, 请见John Gruber 关于语法的官方帖子[此处](http://daringfireball.net/projects/Markdown/syntax)以及 Adam Pritchard 的摘要笔记 [此处](https://github.com/adam-p/Markdown-here/wiki/Markdown-Cheatsheet). From 3b55d56287ca64e3f8504a6de01d45a305aef90f Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 17:03:38 +0800 Subject: [PATCH 08/12] typo correction --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index f82ebcea..95aef8e2 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -41,7 +41,7 @@ Markdown 由 John Gruber 于 2004年创立. 它旨在成为一门容易读写的 ------------- - + *此文本为斜体。* _此文本也是。_ From ed8da6c3a70e93958d71e0d4ae79f1ae7f1ab114 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 17:06:11 +0800 Subject: [PATCH 09/12] Footnote corrected --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 95aef8e2..d0d84d31 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -237,4 +237,4 @@ end ``` -更多信息, 请见John Gruber 关于语法的官方帖子[此处](http://daringfireball.net/projects/Markdown/syntax)以及 Adam Pritchard 的摘要笔记 [此处](https://github.com/adam-p/Markdown-here/wiki/Markdown-Cheatsheet). +更多信息, 请于[此处](http://daringfireball.net/projects/Markdown/syntax)参见 John Gruber 关于语法的官方帖子,及于[此处](https://github.com/adam-p/Markdown-here/wiki/Markdown-Cheatsheet)。 参见 Adam Pritchard 的摘要笔记。 From 731026a038c7f9322ade73d3b4fee3c22cb84640 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Mon, 7 Jul 2014 17:13:48 +0800 Subject: [PATCH 10/12] Update markdown-cn.html.markdown --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index d0d84d31..96b0244c 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -237,4 +237,4 @@ end ``` -更多信息, 请于[此处](http://daringfireball.net/projects/Markdown/syntax)参见 John Gruber 关于语法的官方帖子,及于[此处](https://github.com/adam-p/Markdown-here/wiki/Markdown-Cheatsheet)。 参见 Adam Pritchard 的摘要笔记。 +更多信息, 请于[此处](http://daringfireball.net/projects/Markdown/syntax)参见 John Gruber 关于语法的官方帖子,及于[此处](https://github.com/adam-p/Markdown-here/wiki/Markdown-Cheatsheet) 参见 Adam Pritchard 的摘要笔记。 From d587d9b1c45d545ff9dc7eea99dcb8d649d598f3 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Sat, 26 Jul 2014 01:36:47 +0800 Subject: [PATCH 11/12] Changed filename --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 96b0244c..58ef2d6d 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -4,7 +4,7 @@ contributors: - ["Dan Turkel", "http://danturkel.com/"] translators: - ["Fangzhou Chen"] -filename: Markdown.md +filename: Markdown-cn.md lang: zh-cn --- From 615ee2794184949591f49ff36b3e58c5e166ed39 Mon Sep 17 00:00:00 2001 From: Kevin Fangzhou Chen Date: Tue, 29 Jul 2014 12:08:24 +0800 Subject: [PATCH 12/12] updated the filename into learnmarkdown-cn.md --- zh-cn/markdown-cn.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/markdown-cn.html.markdown b/zh-cn/markdown-cn.html.markdown index 58ef2d6d..975ebcb5 100644 --- a/zh-cn/markdown-cn.html.markdown +++ b/zh-cn/markdown-cn.html.markdown @@ -4,7 +4,7 @@ contributors: - ["Dan Turkel", "http://danturkel.com/"] translators: - ["Fangzhou Chen"] -filename: Markdown-cn.md +filename: learnmarkdown-cn.md lang: zh-cn ---