From f5a3b844a588f073d477c252041d6124fd48cc04 Mon Sep 17 00:00:00 2001 From: Bryan Lee <38807139+liby@users.noreply.github.com> Date: Sat, 20 Jul 2024 02:01:11 +0800 Subject: [PATCH 1/3] Support to click collapse button to switch show and hide answer --- docs/.vuepress/components/Test.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/.vuepress/components/Test.vue b/docs/.vuepress/components/Test.vue index 0cd970d..8e402d0 100644 --- a/docs/.vuepress/components/Test.vue +++ b/docs/.vuepress/components/Test.vue @@ -4,10 +4,10 @@
-
+
-
{{ q }}
+
@@ -21,9 +21,11 @@
-
+
+
+
+
-
@@ -67,6 +69,7 @@ export default { min-width: 1em; float: left; .test_triangle + cursor: pointer; margin-top: 0.5em; width: 0; height: 0; From 5f1b1103c813a29a02f8afc31b7ca75b4f72f61b Mon Sep 17 00:00:00 2001 From: Bryan Lee <38807139+liby@users.noreply.github.com> Date: Sat, 20 Jul 2024 02:03:00 +0800 Subject: [PATCH 2/3] Use `v-html` to render formatted question content --- docs/.vuepress/components/Test.vue | 14 +----- docs/content/Chapter17.md | 40 ++++----------- docs/content/Chapter18.md | 40 ++++----------- docs/content/Chapter19.md | 40 ++++----------- docs/content/Chapter20.md | 40 ++++----------- docs/content/Chapter21.md | 80 ++++++++---------------------- 6 files changed, 61 insertions(+), 193 deletions(-) diff --git a/docs/.vuepress/components/Test.vue b/docs/.vuepress/components/Test.vue index 8e402d0..74cafea 100644 --- a/docs/.vuepress/components/Test.vue +++ b/docs/.vuepress/components/Test.vue @@ -7,7 +7,7 @@
-
+
{{ q }}
@@ -18,17 +18,6 @@
-
-
-
-
-
-
- -
-
-
-
{{ a }} @@ -48,7 +37,6 @@ export default { a: String, // 答案 n: Boolean, // 无答案 -> 3 & 14 章 nt: Boolean, // 无三角 -> 14 章 - qs: Boolean // 有三角 -> 17 章 }, data: function() { return { diff --git a/docs/content/Chapter17.md b/docs/content/Chapter17.md index 494ea71..20d197e 100644 --- a/docs/content/Chapter17.md +++ b/docs/content/Chapter17.md @@ -210,45 +210,25 @@ #### 将下列各句中的关系从句（即画底线部分）改写为简化从句： -1. Medieval suits of armor, which were developed for protection during battle, are now placed in castles for decoration. +Medieval suits of armor, developed for protection during battle, are now placed in castles for decoration. -Medieval suits of armor, developed for protection during battle, are now placed in castles for decoration. +The change of style in these paintings should be obvious to anyone familiar with the artist's works. -2. The change of style in these paintings should be obvious to anyone that is familiar with the artist's works. +Islands are actually tips of underwater mountain peaks rising above waler. -The change of style in these paintings should be obvious to anyone familiar with the artist's works. +John Milton, author of Paradise Lost, was a key member of Oliver Cromwell's cabinet. -3. Islands are actually tips of underwater mountain peaks that rise above water. +The secretary thought that it might not be the best time to ask her boss for a raise. -Islands are actually tips of underwater mountain peaks rising above waler. +Gold is one of the heaviest metals known to man. -4. John Milton, who was author of Paradise Lost, was a key member of Oliver Cromwell's cabinet. +Here are some books for your brother to use. -John Milton, author of Paradise Lost, was a key member of Oliver Cromwell's cabinet. +Sexual harassment, a hotly debated issue in the work place, will be the topic of the intercollegiate debate next week. -5. The secretary thought that it might not be the best time that she should ask her boss for a raise. +There's nothing left (for me) to say now. -The secretary thought that it might not be the best time to ask her boss for a raise. - -6. Gold is one of the heaviest metals that are known to man. - -Gold is one of the heaviest metals known to man. - -7. Here are some books that your brother can use. - -Here are some books for your brother to use. - -8. Sexual harassment, which is a hotly debated issue in the work place, will be the topic of the intercollegiate debate next week. - -Sexual harassment, a hotly debated issue in the work place, will be the topic of the intercollegiate debate next week. - -9. There's nothing left that I can say now. - -There's nothing left (for me) to say now. - -10. People that live along the waterfront must be evacuated before the storm hits. - -People living along the waterfront must be evacuated before the storm hits. +People living along the waterfront must be evacuated before the storm hits. #### 练习二 diff --git a/docs/content/Chapter18.md b/docs/content/Chapter18.md index a6083e9..db48c77 100644 --- a/docs/content/Chapter18.md +++ b/docs/content/Chapter18.md @@ -294,45 +294,25 @@ whether 是由连接词 either…or 变造而成。在这个名词从句中， #### 将下列各句中的名词从句（即画底线部分）改写为简化从句： -1. That he sends flowers to his girlfriend every day is the only way he can think of to gain her favor. +Sending flowers to his girlfriend every day is the only way he can think of to gain her favor. -Sending flowers to his girlfriend every day is the only way he can think of to gain her favor. +The legislator's being involved in the fraud is rather obvious.
或
The legislator's involvement in the fraud is rather obvious. -2. That the legislator was involved in the fraud is rather obvious. +The student denied having cheated in the exam. -The legislator's being involved in the fraud is rather obvious.
或
The legislator's involvement in the fraud is rather obvious. +The researcher is certain about having found a solution. -3. The student denied that he had cheated in the exam. +The residents were not aware of being exposed to radiation.
或
The residents were not aware of their exposure to radiation. -The student denied having cheated in the exam. +I consider this a most unfortunate incident. -4. The researcher is certain that he has found a solution. +John's coming to school late every day cannot go on much longer. -The researcher is certain about having found a solution. +His being named the new CEO came as a surprise to everybody. -5. The residents were not aware that they were being exposed to radiation. +I would like you to look after the kids for me this evening. -The residents were not aware of being exposed to radiation.
或
The residents were not aware of their exposure to radiation. - -6. I consider that this is a most unfortunate incident. - -I consider this a most unfortunate incident. - -7. That John comes to school late every day cannot go on much longer. - -John's coming to school late every day cannot go on much longer. - -8. That he was named the new CEO came as a surprise to everybody. - -His being named the new CEO came as a surprise to everybody. - -9. I would like that you can look after the kids for me this evening. - -I would like you to look after the kids for me this evening. - -10. It is a privilege that one can live in these monumental times. - -It is a privilege to live in these monumental times. +It is a privilege to live in these monumental times. #### 练习二 diff --git a/docs/content/Chapter19.md b/docs/content/Chapter19.md index 7ce97e4..480024d 100644 --- a/docs/content/Chapter19.md +++ b/docs/content/Chapter19.md @@ -181,45 +181,25 @@ being a student 因为有 being，所以 a student 很明显是补语，意思 #### 将下列各句中的副词从句（即画底线部分）改写为简化从句： -1. While he was watching TV, the boy heard a strange noise coming from the kitchen. +(While) waiching TV, the boy heard a strange noise coming from the kitchen. -(While) waiching TV, the boy heard a strange noise coming from the kitchen. +Living with her parents, the girl can't stay out very late. -2. Because she lives with her parents, the girl can't stay out very late. +If having finished your work，you can help me with mine. -Living with her parents, the girl can't stay out very late. +Being a law-enforcement officer, he cannot drink on duty. -3. If you have finished your work, you can help me with mine. +The actor has been in a state of excitement ever since being nominated for the Oscar. -If having finished your work，you can help me with mine. +After addressing the congregation, the minister left in a hurry.
或
Having addressed the congregation, the minister left in a hurry. -4. As he is a law-enforcement officer, he cannot drink on duty. +It being rather warm, we decided to go for a swim. -Being a law-enforcement officer, he cannot drink on duty. +The students having all left, the teacher started looking over their examination sheets. -5. The actor has been in a state of excitement ever since he was nominated for the Oscar. +I know all about corn farming, having grown up in a Southern farm. -The actor has been in a state of excitement ever since being nominated for the Oscar. - -6. After he addressed the congregation, the minister left in a hurry. - -After addressing the congregation, the minister left in a hurry.
或
Having addressed the congregation, the minister left in a hurry. - -7. As it was rather warm, we decided to go for a swim. - -It being rather warm, we decided to go for a swim. - -8. When the students have all left, the teacher started looking over their examination sheets. - -The students having all left, the teacher started looking over their examination sheets. - -9. I know all about corn farming because I grew up in a Southern farm. - -I know all about corn farming, having grown up in a Southern farm. - -10. As the door remained shut, the servant could not hear what was going on inside. - -The door remaining shut, the servant could not hear what was going on inside. +The door remaining shut, the servant could not hear what was going on inside. #### 练习二 diff --git a/docs/content/Chapter20.md b/docs/content/Chapter20.md index 2b29d0f..0ea9227 100644 --- a/docs/content/Chapter20.md +++ b/docs/content/Chapter20.md @@ -206,45 +206,25 @@ be 动词是没有内容的字眼。在此加上 being 一词，纯粹是因应 #### 将下列各句中的副词从句（即画底线部分）改写为简化从句： -1. After he was told to report to his supervisor, the clerk left in a hurry. +(Having been) told to report to his supervisor, the clerk left in a hurry. -(Having been) told to report to his supervisor, the clerk left in a hurry. +Although ordered to leave, the soldier did not move an inch. -2. Although he was ordered to leave, the soldier did not move an inch. +The plan must be modified before being put into effect. -Although ordered to leave, the soldier did not move an inch. +(Having been) bombed twice in the previous week, the village was a total wreck. -3. The plan must be modified before it is put into effect. +All things considered, I cannot truly say that this was an accident. -The plan must be modified before being put into effect. +The job done, the secretary went home. -4. Because it had been bombed twice in the previous week, the village was a total wreck. +He took on two extra jobs (so as) to feed his family. -(Having been) bombed twice in the previous week, the village was a total wreck. +If in doubt, you should look up the word in the dictionary. -5. When all things are considered, I cannot truly say that this was an accident. +With pork so expensive, I'm buying beef instead.
或
Pork being so expensive, I'm buying beef instead. -All things considered, I cannot truly say that this was an accident. - -6. When the job was done, the secretary went home. - -The job done, the secretary went home. - -7. He took on two extra jobs so that he could feed his family. - -He took on two extra jobs (so as) to feed his family. - -8. If you are in doubt, you should look up the word in the dictionary. - -If in doubt, you should look up the word in the dictionary. - -9. Because pork is so expensive, I'm buying beef instead. - -With pork so expensive, I'm buying beef instead.
或
Pork being so expensive, I'm buying beef instead. - -10. When we consider his handicap, he has done very well indeed. - -Considering his handicap, he has done very well indeed. +Considering his handicap, he has done very well indeed. #### 练习二 diff --git a/docs/content/Chapter21.md b/docs/content/Chapter21.md index d370100..d111411 100644 --- a/docs/content/Chapter21.md +++ b/docs/content/Chapter21.md @@ -272,82 +272,42 @@ that 引导的这个名词从句可以如此简化：主语 the Callege football #### 将下列各题中的句子写在一起成为复句或合句，然后再简化到最精简的地步： -1. Ben Book was educated in an art college. (because)
 Ben Book acts unusual.
 Ben Book deals with economic matters. (while) +Because he was educated in an art college. Ben Book acts unusual while he deals with economic matters.
简化为：
Educated in an art college, Ben Book acts unusual while dealing with economic matters. -Because he was educated in an art college. Ben Book acts unusual while he deals with economic matters.
简化为：
Educated in an art college, Ben Book acts unusual while dealing with economic matters. +I'd like that you will meet some people.
简化为：
I'd like you to meet some people. -2. I'd like something.
 You will meet some people. (that) +I'm not sure what I should do.
简化为：
I'm not sure what to do. -I'd like that you will meet some people.
简化为：
I'd like you to meet some people. +He worked late into the night because he was trying to finish the report.
简化为：
He worked late into the night trying to finish the report. -3. I'm not sure.
 What should I do? +After the soldier was wounded in the war, he was sent home.
简化为：
(After being) wounded in the war, the soldier was sent home. -I'm not sure what I should do.
简化为：
I'm not sure what to do. +He used to smoke a lot before he got married.
简化为：
He ie used to smoke a lot before getting married. -4. He worked late into the night.
 He was trying to finish the report. (because) +I am afraid that the Democratic Party might win a majority.
简化为：
I am afraid of the Democratic Party's winning a majority. -He worked late into the night because he was trying to finish the report.
简化为：
He worked late into the night trying to finish the report. +When I have nothing better to do, I enjoy that I play poker.
简化为：
When I have nothing better to do, I enjoy playing poker. -5. The soldier was wounded in the war. (after)
 He was sent home. +When Mike won the contest, he was awarded ten thousand dollars.
简化为：
(Upon) winning the contest. Mike was awarded ten thousand dollars. -After the soldier was wounded in the war, he was sent home.
简化为：
(After being) wounded in the war, the soldier was sent home. +The motorcyclist who did not wear a safety helmet was pulled over by the police car.
简化为：
The motorcyclist not wearing a safety helmet was pulled over by the police car. -6. He used to smoke a lot.
 He got married. (before) +The mayor, who was a very busy person, declined when he was asked to give a speech at the opening ceremony.
简化为：
The mayor, a very busy person, declined when asked to give a speech at the opening ceremony. -He used to smoke a lot before he got married.
简化为：
He ie used to smoke a lot before getting married. +Although tax rates are already very high, they might be raised further to rein in inflation.
简化为：
Although already very high, tax rates might be raised further to rein in inflation. -7. I am afraid.
 The Democratic Party might win a majority. (that) +The resort town is crowded because there has been an influx of tourists for the holiday season.
简化为：
The resort town is crowded with an influx of tourists for the holiday season. -I am afraid that the Democratic Party might win a majority.
简化为：
I am afraid of the Democratic Party's winning a majority. +Though the student had failed in two tests, he was able to pass the course.
简化为：
Though having failed in two tests, the student was able to pass the course. -8. I have nothing better to do. (when)
 I enjoy something.
 I play poker. (that) +That the president avoided the issue was obvious to the audience.
或
It was obvious to the audience that the president avoided the issue.
简化为：
The president's avoiding the issue was obvious to the audience.
或
The president's avoidance of the issue was obvious to the audicnce. -When I have nothing better to do, I enjoy that I play poker.
简化为：
When I have nothing better to do, I enjoy playing poker. +Anyone could tell he was upset because he had the look on his face.
简化为：
Anyone could tell he was upset, with the look on his face. -9. Mike won the contest. (when)
 Mike was awarded ten thousand dollars. +Michacl Crichton, who is author of Jurassic Park, is in town so that he could promote his new novel.
简化为：
Michacl Crichton, author of Jurassic Park, is in town to promote his new novel. -When Mike won the contest, he was awarded ten thousand dollars.
简化为：
(Upon) winning the contest. Mike was awarded ten thousand dollars. +Although I am a conservative, I'd like to see that the conservative party is chastised in the next election.
简化为：
Although (being) a conservative, I'd like to see the conservative party chastised in the next election. -10. The motorcyclist was pulled over by the police car.
   The motorcyclist did not wear a safety helmet. (who) +When the man found a fly in his soup, he called to the waiter.
简化为：
Finding a fly in his soup, the man called to the waiter. -The motorcyclist who did not wear a safety helmet was pulled over by the police car.
简化为：
The motorcyclist not wearing a safety helmet was pulled over by the police car. - -11. The mayor declined.
   The mayor was a very busy person. (who)
   The mayor was asked to give a speech at the opening ceremony. (when) - -The mayor, who was a very busy person, declined when he was asked to give a speech at the opening ceremony.
简化为：
The mayor, a very busy person, declined when asked to give a speech at the opening ceremony. - -12. Tax rates are already very high. (although)
   Tax rates might be raised further to rein in inflation. - -Although tax rates are already very high, they might be raised further to rein in inflation.
简化为：
Although already very high, tax rates might be raised further to rein in inflation. - -13. The resort town is crowded.
   There has been an influx of tourists for the holiday season. (because) - -The resort town is crowded because there has been an influx of tourists for the holiday season.
简化为：
The resort town is crowded with an influx of tourists for the holiday season. - -14. The student had failed in two tests. (though)
   The student was able to pass the course. - -Though the student had failed in two tests, he was able to pass the course.
简化为：
Though having failed in two tests, the student was able to pass the course. - -15. The president avoided the issue. (that)
   This was obvious to the audience. - -That the president avoided the issue was obvious to the audience.
或
It was obvious to the audience that the president avoided the issue.
简化为：
The president's avoiding the issue was obvious to the audience.
或
The president's avoidance of the issue was obvious to the audicnce. - -16. Anyone could tell he was upset.
   He had the look on his face. (because) - -Anyone could tell he was upset because he had the look on his face.
简化为：
Anyone could tell he was upset, with the look on his face. - -17. Michael Crichton is in town.
   He is author of Jurassic Park. (who)
   He could promote his new novel. (so that) - -Michacl Crichton, who is author of Jurassic Park, is in town so that he could promote his new novel.
简化为：
Michacl Crichton, author of Jurassic Park, is in town to promote his new novel. - -18. I am a conservative. (although)
   I'd like to see something.
   The conservative party is chastised in the next election. (that) - -Although I am a conservative, I'd like to see that the conservative party is chastised in the next election.
简化为：
Although (being) a conservative, I'd like to see the conservative party chastised in the next election. - -19. The man found a fly in his soup. (when)
   The man called to the waiter. - -When the man found a fly in his soup, he called to the waiter.
简化为：
Finding a fly in his soup, the man called to the waiter. - -20. It is a warm day. (because)
   We will go to the beach. - -Because it is a warm day, we will go to the beach.
简化为：
It being a warm day, we will go to the beach. +Because it is a warm day, we will go to the beach.
简化为：
It being a warm day, we will go to the beach. From c339557c1b48b5a04729e3584f58864552fd97c3 Mon Sep 17 00:00:00 2001 From: Bryan Lee <38807139+liby@users.noreply.github.com> Date: Sat, 20 Jul 2024 03:04:38 +0800 Subject: [PATCH 3/3] Split `Test` component to optimize the use of choices question --- docs/.vuepress/components/Option.vue | 41 +++++++++++++++++++++ docs/.vuepress/components/Test.vue | 54 ++++++++++++++++------------ docs/content/Chapter14.md | 12 ++++--- 3 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 docs/.vuepress/components/Option.vue diff --git a/docs/.vuepress/components/Option.vue b/docs/.vuepress/components/Option.vue new file mode 100644 index 0000000..7358013 --- /dev/null +++ b/docs/.vuepress/components/Option.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/docs/.vuepress/components/Test.vue b/docs/.vuepress/components/Test.vue index 74cafea..7e4ef5f 100644 --- a/docs/.vuepress/components/Test.vue +++ b/docs/.vuepress/components/Test.vue @@ -2,47 +2,64 @@
-
-
-
+
+
-
{{ q }}
+
-
-
-
({{ options[i] }}) 
-
{{ d }}
-
-
+ +
+ + + +
{{ a }}
-
{{ open ? 'Hide' : 'Show' }} Answer
+
{{ open ? 'Hide' : 'Show' }} Answer
@@ -57,7 +74,6 @@ export default { min-width: 1em; float: left; .test_triangle - cursor: pointer; margin-top: 0.5em; width: 0; height: 0; @@ -65,12 +81,6 @@ export default { border-left: 0.36 * 1.734em solid; border-bottom: 0.36em solid transparent; -.test_choices - margin-left: 1em; - .test_choice - display: flex; - line-height: 1.7; - .test_answer margin-top: 1em; margin-left: 1em; diff --git a/docs/content/Chapter14.md b/docs/content/Chapter14.md index 1f0ba8d..4bb23ec 100644 --- a/docs/content/Chapter14.md +++ b/docs/content/Chapter14.md @@ -550,11 +550,13 @@ wh-ever 解释为 no matter wh-，是表示让步、条件的语气，它的功 A 和 C 都在名词 origin 前面加上了短语（many centuries ago 和 many centuries）来修饰，可是名词前面只能用单词的形容词来修饰，所以错误。B 是正确的形容词从句。 - - - - -两个位置都省掉了先行词，所以只能选择 what。 + + + 两个位置都省掉了先行词，所以只能选择 what。 + 空格前无先行词，只能选 A 或 D。而“当选总统”者应为“人”，故选 D。