Skip to content

Commit

Permalink
add new grammar points, lesson summary
Browse files Browse the repository at this point in the history
- added lesson summary to the grammar index.
- added new grammar points to the grammar index. (#295)
  - Past Tense of です (でした・じゃなかったです)
  - Past Tense of Verbs (~ました・~ませんでした)
  • Loading branch information
SethClydesdale committed Dec 31, 2024
1 parent c488ddc commit fc81f84
Show file tree
Hide file tree
Showing 17 changed files with 204 additions and 23 deletions.
187 changes: 184 additions & 3 deletions lessons-3rd/appendix/grammar-index/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,10 @@ <h3 id="note-3" class="workbook-title">Symbols used in the Grammar Notes</h3>
</div>

<h2 id="lesson-grammar-1" class="lesson-title">Lesson 1: New Friends <span class="page-data">Genki I: p.41-43</span></h2>
<div class="lesson-summary">
<div class="lesson-point">Introduce ourselves</div>
<div class="lesson-point">Ask and tell people names, majors at school, time, etc.</div>
</div>
<div class="center"><button id="toggler-1" class="button grammar-toggler" onclick="GRIndex.toggle(this, 1);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
<div id="exercises-1" class="lesson-exercises">
<h3 id="l1-p1" class="workbook-title" data-keywords="ha、wa、desu、it is、to be、copula">1. XはYです <span class="page-data">Genki I: p.41-42</span></h3>
Expand Down Expand Up @@ -750,6 +754,11 @@ <h3 id="l1-p3" class="workbook-title" data-keywords="possessive、no、's、of">
</div>

<h2 id="lesson-grammar-2" class="lesson-title">Lesson 2: Shopping <span class="page-data">Genki I: p.60-64</span></h2>
<div class="lesson-summary">
<div class="lesson-point">Ask and answer how much things cost</div>
<div class="lesson-point">Do shopping</div>
<div class="lesson-point">Order food in a restaurant</div>
</div>
<div class="center"><button id="toggler-2" class="button grammar-toggler" onclick="GRIndex.toggle(this, 2);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
<div id="exercises-2" class="lesson-exercises">
<h3 id="l2-p1" class="workbook-title" data-keywords="kore、sore、are、dore, this, that (over there), which">1. これ/それ/あれ/どれ <span class="page-data">Genki I: p.60</span></h3>
Expand Down Expand Up @@ -1269,6 +1278,10 @@ <h3 id="l2-p7" class="workbook-title" data-keywords="ne、yo、right、don't you
</div>

<h2 id="lesson-grammar-3" class="lesson-title">Lesson 3: Making a Date <span class="page-data">Genki I: p.86-92</span></h2>
<div class="lesson-summary">
<div class="lesson-point">Talk about daily activities</div>
<div class="lesson-point">Extend, accept, and refuse invitations</div>
</div>
<div class="center"><button id="toggler-3" class="button grammar-toggler" onclick="GRIndex.toggle(this, 3);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
<div id="exercises-3" class="lesson-exercises">
<h3 id="l3-p1" class="workbook-title" data-keywords="masu、masen、ru-verbs、u-verbs、irregular verbs、ichidan、godan、verbal nouns、suru-verbs、affirmative、negative">1. Verb Conjugation (Long form: ~ます・~ません) <span class="page-data">Genki I: p.86-88</span></h3>
Expand Down Expand Up @@ -1442,6 +1455,7 @@ <h3 id="l3-p1" class="workbook-title" data-keywords="masu、masen、ru-verbs、u
<td><ruby>練習<rt>れんしゅう</rt></ruby></td>
<td>
<ul>
<li><a href="../../lesson-3/grammar-0/">Review: Identifying Verbs</a></li>
<li><a href="../../lesson-3/grammar-1/">Practice: Verb Conjugation</a></li>
<li><a href="../../lesson-3/workbook-1/">Workbook: Verb Conjugation</a></li>
</ul>
Expand Down Expand Up @@ -1928,6 +1942,11 @@ <h3 id="l3-p8" class="workbook-title" data-keywords="ha、wa, subject">8. The To
</div>

<h2 id="lesson-grammar-4" class="lesson-title">Lesson 4: The First Date <span class="page-data">Genki I: p.107-113</span></h2>
<div class="lesson-summary">
<div class="lesson-point">Ask and describe where things/people are</div>
<div class="lesson-point">Talk about things that happened in the past</div>
<div class="lesson-point">Talk about habitual actions in the past</div>
</div>
<div class="center"><button id="toggler-4" class="button grammar-toggler" onclick="GRIndex.toggle(this, 4);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
<div id="exercises-4" class="lesson-exercises">
<h3 id="l4-p1" class="workbook-title" data-keywords="arimasu、imasu、ある、いる、ない、aru、iru、nai、to be、there is、there are、have、own、there will be an event、ありません、いません、arimasen、imasen">1. Xがあります/います <span class="page-data">Genki I: p.107-108</span></h3>
Expand Down Expand Up @@ -2051,7 +2070,7 @@ <h3 id="l4-p2" class="workbook-title" data-keywords="みぎ、ひだり、まえ
<tr>
<td><ruby>説明<rt>せつめい</rt></ruby></td>
<td>
In <a href="#l2-p3">Lesson 2</a>, we learned how to ask for, and give, the location of item X.
In <a href="#l2-p3">Lesson 2</a> we learned how to ask for, and give, the location of item X.
<div class="columns-2-in">
<div class="example">
A:マクドナルドはどこですか。<br>
Expand Down Expand Up @@ -2173,14 +2192,175 @@ <h3 id="l4-p2" class="workbook-title" data-keywords="みぎ、ひだり、まえ
</tr>
</table><br>

<h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
<h3 id="l4-p3" class="workbook-title" data-keywords="deshita、janakattadesu、was not">3. Past Tense of です (でした・じゃなかったです) <span class="page-data">Genki I: p.110</span></h3>
<table class="table grammar-table">
<tr>
<td><ruby>本文<rt>ほんぶん</rt></ruby></td>
<td>
<ul>
<li>
おかえりなさい。<ruby>映画<rt>えいが</rt></ruby>はどう<strong class="main-color">でした</strong>か。【Dialogue II: //.2】<br>
Welcome home. How <strong class="main-color">was</strong> the movie?
</li>
</ul>
</td>
</tr>
<tr>
<td><ruby>説明<rt>せつめい</rt></ruby></td>
<td>
The past tense affirmative form of です is でした and the past tense negative form of じゃないです is じゃなかったです.
<table class="table alt-cell-color">
<tr class="table-head">
<td class="main-color">です</td>
<td>affirmative</td>
<td>negative</td>
</tr>
<tr>
<td>[Present]</td>
<td>~で<span class="ul-color"></span></td>
<td>~じゃな<span class="ul-color"></span>です</td>
</tr>
<tr>
<td>[Past]</td>
<td>~で<span class="ul-color">した</span></td>
<td>~じゃな<span class="ul-color">かった</span>です</td>
</tr>
</table>
The past tense form of the more conservative じゃありません is じゃありませんでした and the more formal ではありません is ではありませんでした. In both cases, you simply add でした on the end to make it past tense.
</td>
</tr>
<tr>
<td><ruby>英訳<rt>えいやく</rt></ruby></td>
<td>
でした = was<br>
じゃなかったです = was not
</td>
</tr>
<tr>
<td><ruby>文型<rt>ぶんけい</rt></ruby></td>
<td>
a. ~でした<br>
b. N/ANaじゃなかった(です)
</td>
</tr>
<tr>
<td><ruby>例文<rt>れいぶん</rt></ruby></td>
<td>
<ol>
<li>
<div class="columns-2-in">
<div class="example"><ruby>山下先生<rt>やましたせんせい</rt></ruby>はさくら<ruby>大学<rt>だいがく</rt></ruby><ruby>学生<rt>がくせい</rt></ruby><strong class="main-color">でした</strong></div>
<div class="example">Mr. Yamashita <strong class="main-color">was</strong> a student at Sakura University.</div>
</div>
</li>
<li>
<div class="columns-2-in">
<div class="example">あれは<ruby>日本<rt>にほん</rt></ruby><ruby>映画<rt>えいが</rt></ruby><strong class="main-color">じゃなかったです</strong></div>
<div class="example">That <strong class="main-color">was not</strong> a Japanese movie.</div>
</div>
</li>
</ol>
</td>
</tr>
<tr class="ex-list">
<td><ruby>練習<rt>れんしゅう</rt></ruby></td>
<td>
<ul>
<li><a href="../../lesson-4/grammar-5/">Practice: Past Tense of です</a></li>
<li><a href="../../lesson-4/workbook-3/">Workbook: Past Tense (Nouns)</a></li>
</ul>
</td>
</tr>
</table><br>

<h3 id="l4-p4" class="workbook-title" data-keywords="ませんでした、masendeshita、ました、mashita、long form、did not、didn't">4. Past Tense of Verbs (~ました・~ませんでした) <span class="page-data">Genki I: p.110</span></h3>
<table class="table grammar-table">
<tr>
<td><ruby>本文<rt>ほんぶん</rt></ruby></td>
<td>
<ul>
<li>
<ruby><rt></rt></ruby><strong class="main-color">ませんでした</strong>。たけしさんは<ruby><rt></rt></ruby><strong class="main-color">ませんでした</strong>。【Dialogue II: //.3】<br>
I <strong class="main-color">didn't</strong> see it. Takeshi <strong class="main-color">didn't</strong> come.
</li>
<li>
<ruby><rt>てら</rt></ruby><ruby>写真<rt>しゃしん</rt></ruby>をたくさん<ruby><rt></rt></ruby><strong class="main-color">ました</strong>。【Dialogue II: //.8-9】<br>
I <strong class="main-color">took</strong> many pictures at the temple.
</li>
</ul>
</td>
</tr>
<tr>
<td><ruby>説明<rt>せつめい</rt></ruby></td>
<td>
The past tense forms of verbs end with ました in the affirmative and ませんでした in the negative.
<table class="table alt-cell-color">
<tr class="table-head">
<td class="main-color">Verbs</td>
<td>affirmative</td>
<td>negative</td>
</tr>
<tr>
<td>[Present]</td>
<td>~ま<span class="ul-color"></span></td>
<td>~ません</td>
</tr>
<tr>
<td>[Past]</td>
<td>~ま<span class="ul-color">した</span></td>
<td>~ません<span class="ul-color">でした</span></td>
</tr>
</table>
The conjugation rules listed in <a href="#l3-p1">Lesson 3</a> for the long form are exactly the same for the past tense form.
</td>
</tr>
<tr>
<td><ruby>文型<rt>ぶんけい</rt></ruby></td>
<td>
a. V-stemました<br>
b. V-stemませんでした
</td>
</tr>
<tr>
<td><ruby>例文<rt>れいぶん</rt></ruby></td>
<td>
<ol>
<li>
<div class="columns-2-in">
<div class="example">メアリーさんは<ruby>九時<rt>くじ</rt></ruby>ごろうちに<ruby><rt>かえ</rt></ruby><strong class="main-color">ました</strong></div>
<div class="example">Mary return<strong class="main-color">ed</strong> home at about nine.</div>
</div>
<div class="columns-2-in">
<div class="example"><ruby><rt>わたし</rt></ruby>はきのう<ruby>日本語<rt>にほんご</rt></ruby><ruby>勉強<rt>べんきょう</rt></ruby><strong class="main-color">ませんでした</strong></div>
<div class="example">I <strong class="main-color">did not</strong> study Japanese yesterday.</div>
</div>
</li>
</ol>
</td>
</tr>
<tr class="ex-list">
<td><ruby>練習<rt>れんしゅう</rt></ruby></td>
<td>
<ul>
<li><a href="../../lesson-4/grammar-6/">Practice: Verb Conjugation (Past Tense)</a></li>
<li><a href="../../lesson-4/grammar-7/">Practice: Past Tense of Verbs 1</a></li>
<li><a href="../../lesson-4/grammar-8/">Practice: Past Tense of Verbs 2</a></li>
<li><a href="../../lesson-4/grammar-9/">Practice: Past Tense of Verbs 3</a></li>
<li><a href="../../lesson-4/workbook-4/">Workbook: Verb Conjugation (Past Tense)</a></li>
<li><a href="../../lesson-4/workbook-5/">Workbook: Past Tense (Verbs)</a></li>
</ul>
</td>
</tr>
</table><br>

<br><h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
</div>

<!--
<h2 id="lesson-grammar-5" class="lesson-title">Lesson 5: <span class="page-data">Genki I: p.</span></h2>
<div class="center"><button id="toggler-5" class="button grammar-toggler" onclick="GRIndex.toggle(this, 5);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
<div id="exercises-5" class="lesson-exercises">
<h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
<br><h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
</div>
<h3 id="l4-p" class="workbook-title" data-keywords="">. <span class="page-data">Genki I: p.</span></h3>
Expand Down Expand Up @@ -2226,6 +2406,7 @@ <h3 id="l4-p" class="workbook-title" data-keywords="">. <span class="page-data"
<td>
<ul>
<li><a href="../../lesson-4/grammar-/">Practice:</a></li>
<li><a href="../../lesson-4/workbook-/">Workbook:</a></li>
</ul>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-3/grammar-0/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'multi',
info : 'It is important to remember which verbs belong to which conjugation class. This is especially important for verbs that end with る, because they may be irregular verbs, ru-verbs, or u-verbs. Review Grammar 1 (Genki I: p.86-88) and then practice recalling the rules for identifying verbs.',
info : 'It is important to remember which verbs belong to which conjugation class. This is especially important for verbs that end with る, because they may be irregular verbs, ru-verbs, or u-verbs. Review {!GRI|Grammar 1|l3-p1} (Genki I: p.86-88) and then practice recalling the rules for identifying verbs.',

quizlet : [
{
Expand Down
4 changes: 2 additions & 2 deletions lessons-3rd/lesson-4/grammar-5/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : ['Look at the information about Professor Yamashita 25 years ago and answer the questions.<br><br>'+
info : ['Look at the information about Professor Yamashita 25 years ago and answer the questions using the {!GRI|Past Tense of です|l4-p3}.<br><br>'+
'<table><tr><td>'+
'Twenty-five years ago, Professor Yamashita was...'+
'<ul>'+
Expand All @@ -85,7 +85,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'<li>good student</li>'+
'<li>his major: Japanese history</li>'+
'</ul>'+
'</td></tr></table>', 'Look at the information about Professor Yamashita 25 years ago and answer the questions.'],
'</td></tr></table>', 'Look at the information about Professor Yamashita 25 years ago and answer the questions using the {!GRI|Past Tense of です|l4-p3}.'],

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-4/grammar-6/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'Change the verbs into ~ました and ~ませんでした.',
info : 'Change the verbs into {!GRI|~ました and ~ませんでした|l4-p4}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-4/grammar-7/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'Read the cues and tell what Mary did last week.',
info : 'Read the cues and tell what Mary did last week using the {!GRI|past tense|l4-p4}.',

quizlet : [
[
Expand Down
4 changes: 2 additions & 2 deletions lessons-3rd/lesson-4/grammar-8/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : ['Look at Mary\'s schedule for last week and answer the questions.<br><br>'+
info : ['Look at Mary\'s schedule for last week and answer the questions using the {!GRI|past tense|l4-p4}.<br><br>'+
'<table class="center" style="width:400px">'+
'<tr>'+
'<td class="t-bold">Monday</td>'+
Expand Down Expand Up @@ -112,7 +112,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'<td class="t-bold">Sunday</td>'+
'<td>Did shopping at a supermarket</td>'+
'</tr>'+
'</table>', 'Look at Mary\'s schedule for last week and answer the questions.'],
'</table>', 'Look at Mary\'s schedule for last week and answer the questions using the {!GRI|past tense|l4-p4}.'],

quizlet : [
[
Expand Down
4 changes: 2 additions & 2 deletions lessons-3rd/lesson-4/grammar-9/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : ['Look at Mary\'s schedule for last week and answer the questions.<br><br>'+
info : ['Look at Mary\'s schedule for last week and answer the questions using the {!GRI|past tense|l4-p4}.<br><br>'+
'<table class="center" style="width:400px">'+
'<tr>'+
'<td class="t-bold">Monday</td>'+
Expand Down Expand Up @@ -112,7 +112,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'<td class="t-bold">Sunday</td>'+
'<td>Did shopping at a supermarket</td>'+
'</tr>'+
'</table>', 'Look at Mary\'s schedule for last week and answer the questions.'],
'</table>', 'Look at Mary\'s schedule for last week and answer the questions using the {!GRI|past tense|l4-p4}.'],

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-4/workbook-3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Complete the following problems using past tense nouns.',
info : 'Complete the following problems using {!GRI|past tense nouns|l4-p3}.',

quizlet :
'<div class="count-problems">'+
Expand Down
Loading

0 comments on commit fc81f84

Please sign in to comment.