Skip to content

Commit

Permalink
add new grammar points
Browse files Browse the repository at this point in the history
- added new grammar points to the grammar index. (#295)
  - この/その/あの/どの+Noun
  - ここ/そこ/あそこ/どこ
  - だれの
  • Loading branch information
SethClydesdale committed Dec 24, 2024
1 parent 0ac7348 commit 082e392
Show file tree
Hide file tree
Showing 12 changed files with 278 additions and 22 deletions.
268 changes: 262 additions & 6 deletions lessons-3rd/appendix/grammar-index/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lessons-3rd/lesson-2/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 : 'Read the provided information and make sentences using この, その, or あの.',
info : 'Read the provided information and make sentences using {!GRI|この, その, or あの|l2-p2}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-2/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 : 'Read the provided information and ask where the following are using どこ.',
info : 'Read the provided information and ask where the following are using {!GRI|どこ|l2-p3}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-2/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 provided information and answer where the following are using ここ, そこ, or あそこ.',
info : 'Read the provided information and answer where the following are using {!GRI|ここ, そこ, or あそこ|l2-p3}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-2/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 : '1-5: Look at the item and ask whose it is.<br>6-10: Answer who the item belongs to.',
info : '1-5: Look at the item and ask whose it is using {!GRI|だれの|l2-p4}.<br>6-10: Answer who the item belongs to.',

quizlet : [
[
Expand Down
4 changes: 2 additions & 2 deletions lessons-3rd/lesson-2/workbook-3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ <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 conversation between the attendant and the customer at a watch shop.',
info : 'Complete the following conversation between the attendant and the customer at a watch shop using {!GRI|この/その/あの|l2-p2}.',

quizlet :
'<div class="count-problems">'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>Look at the picture and complete the following conversation between the attendant and the customer at a watch shop.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>Look at the picture and complete the following conversation between the attendant and the customer at a watch shop using {!GRI|この/その/あの|l2-p2}.</p>'+
'<div class="center">{!IMG|3rd-l2-wb3-1.png|1:¥3,000; 2:¥2,800; 3:¥1,500}</div><br>'+

'<p><span style="visibility:hidden;">0. </span>Attendant:いらっしゃいませ。</p>'+
Expand Down
6 changes: 3 additions & 3 deletions lessons-3rd/lesson-2/workbook-4/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ <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 ここ, そこ, あそこ, and だれの.',
info : 'Complete the following problems using {!GRI|ここ, そこ, あそこ|l2-p3}, and {!GRI|だれの|l2-p4}.',

quizlet :
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>You are B. Answer A\'s questions with ここ, そこ, or あそこ.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>You are B. Answer A\'s questions with {!GRI|ここ, そこ, or あそこ|l2-p3}.</p>'+
'<div class="count-problems columns-2 clear">'+
'<div>'+
'<div class="problem">'+
Expand Down Expand Up @@ -113,7 +113,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'<div>{!IMG|3rd-l2-wb4-1.png|Takeshi: far from A and B; Sora: next to A; Robert: next to B; Toilet: far from A and B}</div>'+
'</div>'+

'<p class="sectionDesc3rd"><span class="sectionNumber3rd">II</span>Your friends left their belongings in your room. Ask Yui whose item\'s these are.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">II</span>Your friends left their belongings in your room. Ask Yui whose item\'s these are using {!GRI|だれの|l2-p4}.</p>'+
'<div class="center">{!IMG|3rd-l2-wb4-2.png|hat: in your hand; wallet: in your hand; umbrella: far from both}</div>'+

'<div class="count-problems">'+
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-2/grammar-2/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 : 'Read the provided information and make sentences using この, その, or あの.',
info : 'Read the provided information and make sentences using {!GRI|この, その, or あの|l2-p2}.',

quizlet : [
{
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-2/grammar-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 : 'multi',
info : 'You\'re lost and need directions. Read the provided information and ask where the following are.',
info : 'You\'re lost and need directions. Read the provided information and ask where the following are using {!GRI|どこ|l2-p3}.',

quizlet : [
{
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-2/grammar-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 : 'multi',
info : 'You run into strangers who require directions. Aid them by giving the correct directions. Remember to pay attention to the distance!',
info : 'You run into strangers who require directions. Aid them by giving the correct directions using {!GRI|ここ/そこ/あそこ|l2-p3}. Remember to pay attention to the distance!',

quizlet : [
{
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-2/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 conversation between the attendant and the customer at a watch shop.',
info : 'Complete the conversation between the attendant and the customer at a watch shop using {!GRI|この/その/あの|l2-p2}.',

quizlet :
'<div class="count-problems">'+
Expand Down
6 changes: 3 additions & 3 deletions lessons/lesson-2/workbook-4/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ <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 ここ, そこ, あそこ, and だれの.',
info : 'Complete the following problems using {!GRI|ここ, そこ, あそこ|l2-p3}, and {!GRI|だれの|l2-p4}.',

quizlet :
'<div class="count-problems">'+
'<p class="section-desc">You are B. Answer A\'s questions with ここ, そこ, or あそこ.</p>'+
'<p class="section-desc">You are B. Answer A\'s questions with {!GRI|ここ, そこ, or あそこ|l2-p3}.</p>'+
'<table class="table center">'+
'<tr style="font-weight:bold;">'+
'<td>Person:</td>'+
Expand Down Expand Up @@ -118,7 +118,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'B:{あそこです|トイレはあそこです|answer}。'+
'</div>'+

'<p class="section-desc">Your friends left their belongings in your room. Ask Michiko whose item\'s these are.</p>'+
'<p class="section-desc">Your friends left their belongings in your room. Ask Michiko whose item\'s these are using {!GRI|だれの|l2-p4}.</p>'+
'<table class="table center">'+
'<tr style="font-weight:bold;">'+
'<td>ぼうし</td>'+
Expand Down

0 comments on commit 082e392

Please sign in to comment.