Skip to content

Commit

Permalink
add new grammar points, fixes
Browse files Browse the repository at this point in the history
- fixed gendered language in lesson-12/workbook-6.
- added new grammar points to the grammar index. (#295)
  - Adjectives (Past Tense)
  - Adjectives (Noun Modification)
  • Loading branch information
SethClydesdale committed Jan 13, 2025
1 parent 6da5532 commit d913e0c
Show file tree
Hide file tree
Showing 18 changed files with 222 additions and 27 deletions.
201 changes: 198 additions & 3 deletions lessons-3rd/appendix/grammar-index/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<div id="appendix-tool" class="content-block">
<h2 id="main-dict-title" class="title center">巻末 - Grammar Index</h2>

<p>Welcome to the Grammar Index! Here you can quickly find and review the grammar points taught in Genki. Use the quick navigation to jump to a lesson's grammar or use the quick search to find the grammar point you want to read up on.</p>
<p>Welcome to the Grammar Index! Here you can quickly find and review the grammar points taught in Genki. Use the quick navigation to jump to a lesson's grammar or use the quick search to find the grammar point you want to read up on.<br>If you found this page helpful, please consider purchasing a <a href="https://genki3.japantimes.co.jp/bookstores/">copy of the textbooks</a> if you haven't yet to support the authors!</p>

<div class="wip">
<div>WORK IN PROGRESS</div>
Expand Down Expand Up @@ -2726,12 +2726,12 @@ <h3 id="l5-p1" class="workbook-title" data-keywords="い-adjectives、な-adject
</td>
<td>
<ruby>元気<rt>げんき</rt></ruby><span class="ul-color">です</span><br>
(I) am doing well.
She is healthy.
</td>
<td>
<ruby>元気<rt>げんき</rt></ruby><span class="ul-color">じゃないです</span><br>
 (or <ruby>元気<rt>げんき</rt></ruby><span class="ul-color">じゃありません</span>)<br>
(I) am not doing well.
She is not healthy.
</td>
</tr>
</table>
Expand Down Expand Up @@ -2816,6 +2816,201 @@ <h3 id="l5-p1" class="workbook-title" data-keywords="い-adjectives、な-adject
</tr>
</table><br>

<h3 id="l5-p2" class="workbook-title" data-keywords="い-adjectives、な-adjectives、adjective conjugation、affirmative、negative">2. Adjectives (Past Tense) <span class="page-data">Genki I: p.133-134</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"><ruby><rt>たの</rt></ruby>しかった</strong>ですか。【Dialogue III: //.1】<br>
Robert, <strong class="main-color">did</strong> you <strong class="main-color">enjoy</strong> the trip?
</li>
</ul>
</td>
</tr>
<tr>
<td><ruby>説明<rt>せつめい</rt></ruby></td>
<td>
With い-adjectives, you change the last い to かったです in the affirmative. In the negative, you only need to change the present tense くない to くなかったです. な-adjectives are just like nouns, so the affirmative is でした and the negative じゃなかったです. Be careful not to confuse the two patterns, however, as it is wrong to say ×さむいでした, for example.
<table class="table alt-cell-color">
<tr class="table-head">
<td class="main-color">[Past]</td>
<td>affirmative</td>
<td>negative</td>
</tr>
<tr>
<td>
<strong>い-adjectives</strong><br>
<span class="main-color">e.g.</span> さむい
</td>
<td>
さむ<span class="ul-color">かったです</span><br>
It was cold.
</td>
<td>
さむ<span class="ul-color">くなかったです</span><br>
 (or さむ<span class="ul-color">くありませんでした</span>)<br>
It was not cold.
</td>
</tr>
<tr>
<td>
<strong>な-adjectives</strong><br>
<span class="main-color">e.g.</span> <ruby>元気<rt>げんき</rt></ruby>(な)
</td>
<td>
<ruby>元気<rt>げんき</rt></ruby><span class="ul-color">でした</span><br>
She was healthy.
</td>
<td>
<ruby>元気<rt>げんき</rt></ruby><span class="ul-color">じゃなかったです</span><br>
 (or <ruby>元気<rt>げんき</rt></ruby><span class="ul-color">じゃありませんでした</span>)<br>
She was not healthy.
</td>
</tr>
</table>

<div class="columns-2-in">
<div class="example">
A:テストは<strong class="main-color"><ruby><rt>むずか</rt></ruby><span class="ul-color">かった</span></strong><span class="ul-color">です</span>か。<br>
B:いいえ、ぜんぜん<strong class="main-color"><ruby><rt>むずか</rt></ruby><span class="ul-color">くなかった</span></strong><span class="ul-color">です</span>
</div>
<div class="example">
A:<strong class="main-color">Was</strong> the exam <strong class="main-color">difficult</strong>?<br>
B:No, it <strong class="main-color">was not difficult</strong> at all.
</div>
</div>

<div class="columns-2-in">
<div class="example">
A:その<ruby><rt>まち</rt></ruby><strong class="main-color">にぎやか</strong><span class="ul-color">でした</span>か。<br>
B:いいえ、<strong class="main-color">にぎやか<span class="ul-color">じゃなかった</span></strong><span class="ul-color">です</span>
</div>
<div class="example">
A:<span class="ul-color">Was</span> the town <strong class="main-color">lively</strong>?<br>
B:No, it <strong class="main-color">was not lively.</strong>
</div>
</div><br>

The い-adjective いい (good) is irregular and has it's first syllable changed to よ as in the present tense conjugations.
<table class="table alt-cell-color">
<tr class="table-head">
<td><span class="main-color">[Past]</span> (irregular)</td>
<td>affirmative</td>
<td>negative</td>
</tr>
<tr>
<td>いい</td>
<td><span class="ul-color"></span>かったです</td>
<td>
<span class="ul-color"></span>くなかったです<br>
 (or <span class="ul-color"></span>くありませんでした)
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td><ruby>文型<rt>ぶんけい</rt></ruby></td>
<td>
<strong>affirmative</strong><br>
a. A-stem+かった(です)<br>
b. ANa+{でした/だった}<br><br>

<strong>negative</strong><br>
a. A-stem+{くなかった(です)/くありませんでした}<br>
b. ANa+{じゃなかった(です)/じゃありませんでした}
</td>
</tr>
<tr class="ex-list">
<td><ruby>練習<rt>れんしゅう</rt></ruby></td>
<td>
<ul>
<li><a href="../../lesson-5/grammar-5/">Practice: Adjective Conjugation (Past Affirmative)</a></li>
<li><a href="../../lesson-5/grammar-6/">Practice: Adjective Conjugation (Past Negative)</a></li>
<li><a href="../../lesson-5/grammar-7/">Practice: Adjectives (Past Tense) 1</a></li>
<li><a href="../../lesson-5/grammar-8/">Practice: Adjectives (Past Tense) 2</a></li>
<li><a href="../../lesson-5/workbook-3/">Workbook: Adjective Conjugation (Present and Past Tenses)</a></li>
<li><a href="../../lesson-5/workbook-4/">Workbook: Adjectives (Past Tense)</a></li>
</ul>
</td>
</tr>
</table><br>

<h3 id="l5-p3" class="workbook-title" data-keywords="い-adjectives、な-adjectives">3. Adjectives (Noun Modification) <span class="page-data">Genki I: p.134</span></h3>
<table class="table grammar-table">
<tr>
<td><ruby>本文<rt>ほんぶん</rt></ruby></td>
<td>
<ul>
<li>
わあ、<span class="ul-color"><strong class="main-color">きれいな</strong></span><ruby><span class="ul-color"></span><rt>うみ</rt></ruby>!【Dialogue I: //.3】<br>
Wow, what a <span class="ul-color"><strong class="main-color">beautiful</strong> sea</span>!
</li>
</ul>
</td>
</tr>
<tr>
<td><ruby>説明<rt>せつめい</rt></ruby></td>
<td>
Adjectives in Japanese can be used to modify nouns. Simply place the adjective before the noun that you want to modify. Please note, however, that な-adjectives must retain "な" when modifying nouns.
<div class="example">
い-adjectives:  おもしろい<ruby>映画<rt>えいが</rt></ruby>  an interesting movie<br>
な-adjectives:  きれい<span class="ul-color"></span><ruby>写真<rt>しゃしん</rt></ruby>  a beautiful picture
</div>
</td>
</tr>
<tr>
<td><ruby>文型<rt>ぶんけい</rt></ruby></td>
<td>
a. A+N<br>
b. ANaな+N
</td>
</tr>
<tr>
<td><ruby>例文<rt>れいぶん</rt></ruby></td>
<td>
<ol>
<li>
<div class="columns-2-in">
<div class="example">きのう、<span class="ul-color"><strong class="main-color">おもしろい</strong></span><ruby><span class="ul-color">映画</span><rt>えいが</rt></ruby><ruby><rt></rt></ruby>ました。</div>
<div class="example">I saw an <span class="ul-color"><strong class="main-color">interesting</strong> movie</span> yesterday.</div>
</div>
</li>
<li>
<div class="columns-2-in">
<div class="example"><ruby>山下先生<rt>やましたせんせい</rt></ruby><span class="ul-color"><strong class="main-color">こわい</strong></span><ruby><span class="ul-color">先生</span><rt>せんせい</rt></ruby>です。</div>
<div class="example">Professor Yamashita is a <span class="ul-color"><strong class="main-color">scary</strong> teacher</span>.</div>
</div>
</li>
<li>
<div class="columns-2-in">
<div class="example"><ruby>京都<rt>きょうと</rt></ruby><span class="ul-color"><strong class="main-color">きれいな</strong></span><ruby><span class="ul-color">写真</span><rt>しゃしん</rt></ruby><ruby><rt></rt></ruby>りました。</div>
<div class="example">I took a <span class="ul-color"><strong class="main-color">beautiful</strong> picture</span> in Kyoto.</div>
</div>
</li>
<li>
<div class="columns-2-in">
<div class="example">ここはとても<span class="ul-color"><strong class="main-color">にぎやかな</strong></span><ruby><span class="ul-color"></span><rt>まち</rt></ruby>です。</div>
<div class="example">This is a very <span class="ul-color"><strong class="main-color">vibrant</strong> city</span>.</div>
</div>
</li>
</ol>
</td>
</tr>
<tr class="ex-list">
<td><ruby>練習<rt>れんしゅう</rt></ruby></td>
<td>
<ul>
<li><a href="../../lesson-5/grammar-9/">Practice: Adjectives (Noun Modification) 1</a></li>
<li><a href="../../lesson-5/grammar-10/">Practice: Adjectives (Noun Modification) 2</a></li>
<li><a href="../../lesson-5/workbook-5/">Workbook: Adjective + Noun</a></li>
</ul>
</td>
</tr>
</table><br>

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

Expand Down
16 changes: 8 additions & 8 deletions lessons-3rd/lesson-12/workbook-6/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,42 +81,42 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'<div class="count-problems">'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>You live in a dormitory and you will get a new roomate. Ask the coordinator what that person is like, using ~でしょうか.</p>'+
'<div class="problem">'+
'Are they Japanese?<br>'+
'Is she/he Japanese?<br>'+
'{日本人でしょうか|にほんじんでしょうか|answer}。'+
'</div>'+

'<div class="problem">'+
'What is their major?<br>'+
'What is her/his major?<br>'+
'{専攻は何でしょうか|せんこうはなんでしょうか|' + Genki.getAlts('{専攻}は{何}でしょうか', 'せんこう|なん') + 'answer}。'+
'</div>'+

'<div class="problem">'+
'Are they a quiet person?<br>'+
'Is she/he a quiet person?<br>'+
'{静かな人でしょうか|しずかなひとでしょうか|answer}。'+
'</div>'+

'<div class="problem">'+
'What kind of music do they like?<br>'+
'What kind of music does she/he like?<br>'+
'{どんな音楽が好きでしょうか|どんなおんがくがすきでしょうか|' + Genki.getAlts('どんな{音楽}が{好}きでしょうか', 'おんがく|す') + 'answer}。'+
'</div>'+

'<div class="problem">'+
'Do they smoke?<br>'+
'Does she/he smoke?<br>'+
'{たばこを吸うでしょうか|たばこをすうでしょうか|' + Genki.getAlts('{たばこ}を{吸}うでしょうか', 'タバコ|す') + 'answer}。'+
'</div>'+

'<div class="problem">'+
'Do they have many friends?<br>'+
'Does she/he have many friends?<br>'+
'{友だちがたくさんいるでしょうか|ともだちがたくさんいるでしょうか|' + Genki.getAlts('{友}{だち}がたくさんいるでしょうか', 'とも|達') + 'answer}。'+
'</div>'+

'<div class="problem">'+
'What kind of food do they like?<br>'+
'What kind of food does she/he like?<br>'+
'{どんな食べ物が好きでしょうか|どんなたべものがすきでしょうか|' + Genki.getAlts('どんな{食べ物}が{好}きでしょうか', 'たべもの|す') + 'answer}。'+
'</div>'+

'<div class="problem">'+
'Do they have a car?<br>'+
'Does she/he have a car?<br>'+
'{車があるでしょうか|くるまがあるでしょうか|answer}。'+
'</div>'+
'</div>'
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/grammar-10/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 : 'Answer the questions using the given cues.',
info : 'Answer the questions using the given cues. {!GRI|Click here|l5-p3} to review how adjectives modify nouns.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/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 : 'Change the following adjectives into the past affirmative.',
info : 'Change the following adjectives into the {!GRI|past affirmative|l5-p2}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/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 following adjectives into the past negative.',
info : 'Change the following adjectives into the {!GRI|past negative|l5-p2}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/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 : 'This is what Robert wrote down about the trip to Okinawa. Look at his notes and make sentences.',
info : 'This is what Robert wrote down about the trip to Okinawa. Look at his notes and make sentences using {!GRI|past tense adjectives|l5-p2}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/grammar-8/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'A and B are talking. Complete the dialogue between A and B by using the cues in A\'s dialogue.',
info : 'A and B are talking. Complete the dialogue between A and B by using the cues in A\'s dialogue. {!GRI|Click here|l5-p2} to review past tense adjectives.',

questionsAlignLeft : true,
quizlet : [
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/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 the pictures and make comments on them, using an adjective to modify the noun.<br>Example: おいしい + たべもの = おいしいたべもの; delicious food',
info : 'Look at the pictures and make comments on them, using an {!GRI|adjective to modify the noun|l5-p3}.<br>Example: おいしい + たべもの = おいしいたべもの; delicious food',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/workbook-4/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 adjectives.',
info : 'Complete the following problems using {!GRI|past tense adjectives|l5-p2}.',

quizlet :
'<div class="count-problems">'+
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-5/workbook-5/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 by using adjectives to describe the nouns.',
info : 'Complete the following problems by using {!GRI|adjectives to describe the nouns|l5-p3}.',

quizlet :
'<div class="count-problems">'+
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-5/grammar-10/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 : 'Answer the questions about Mary and her friends.',
info : 'Answer the questions about Mary and her friends. {!GRI|Click here|l5-p3} to review how adjectives modify nouns.',

quizlet : [
{
Expand Down
Loading

0 comments on commit d913e0c

Please sign in to comment.