add new grammar points, update formatting, etc.

- added missing grammar index link under the appendix section on the homepage. - added new grammar points to the grammar index. (#295) - これ／それ／あれ／どれ - updated format for 英訳 and 文型 entries in the grammar index. - removed break for settings button on the index. - reduced grammar example width to fix unnecessary breakage. - simplified generic grammar point review text in exercises.
SethClydesdale · Dec 23, 2024 · 9195f10 · 9195f10
1 parent 9d82d6d
commit 9195f10
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 36 deletions.
diff --git a/index.html b/index.html
@@ -67,7 +67,6 @@ <h3 id="page-links">Page Links</h3>
           <span><a id="link-download" href="download/"><i class="fa">&#xf019;</i>Download</a></span>
           <span><a id="link-donate" href="donate/"><i class="fa">&#xf004;</i>Donate</a></span>
           <span><a id="link-github" href="https://github.com/SethClydesdale/genki-study-resources"><i class="fa">&#xf09b;</i>GitHub</a></span>
-          <br>
           <span><a id="link-settings" href="#genki-site-settings" onclick="GenkiSettings.manager(); return false;"><i class="fa">&#xf013;</i>Site Settings</a></span>
         </div>
 

diff --git a/lessons-3rd/appendix/grammar-index/index.html b/lessons-3rd/appendix/grammar-index/index.html
@@ -73,7 +73,7 @@
 
       .columns-2-in > div.example {
         display:inline-block;
-        width:47%;
+        width:46%;
         margin:10px 5px;
         vertical-align:top;
       }
@@ -178,7 +178,7 @@ <h2 id="quick-nav">Quick Navigation</h2>
             <ul id="quick-nav-list">
               <li><a href="#grammar-note-usage">Grammar Notes Usage</a></li>
               <li><a href="#lesson-grammar-1">Lesson 1: New Friends</a></li>
-              <li><a href="#lesson-grammar-2">Lesson 2: Coming Soon</a></li>
+              <li><a href="#lesson-grammar-2">Lesson 2: Shopping</a></li>
             </ul>
           </div>
 
@@ -416,11 +416,11 @@ <h3 id="l1-p1" class="workbook-title" data-keywords="ha、wa、desu、it is、to
               <td>
                 <ul>
                   <li>
-                    こんにちは。きむら たけし<strong class="main-color">です</strong>。【Dialogue I：//.1】<br>
+                    こんにちは。きむら たけし<strong class="main-color">です</strong>。【Dialogue I: //.1】<br>
                     Hello. I am Takeshi Kimura.
                   </li>
                   <li>
-                    せんこう<strong class="main-color">は</strong>にほんご<strong class="main-color">です</strong>。【Dialogue II：//.3】<br>
+                    せんこう<strong class="main-color">は</strong>にほんご<strong class="main-color">です</strong>。【Dialogue II: //.3】<br>
                     My major is Japanese.
                   </li>
                 </ul>
@@ -433,7 +433,7 @@ <h3 id="l1-p1" class="workbook-title" data-keywords="ha、wa、desu、it is、to
             <tr>
               <td><ruby>英訳<rt>えいやく</rt></ruby></td>
               <td>
-                a. ～です = It is.../to be...
+                a. ～です = It is...; to be...
                 <br>b. XはYです = X is Y. As for X, it is Y.
               </td>
             </tr>
@@ -520,7 +520,7 @@ <h3 id="l1-p2" class="workbook-title" data-keywords="ka、yes?、no?、is it?、
               <td>
                 <ul>
                   <li>
-                    メアリー・ハートです。あのう、りゅうがくせいです<strong class="main-color">か</strong>。【Dialogue I：//.2】<br>
+                    メアリー・ハートです。あのう、りゅうがくせいです<strong class="main-color">か</strong>。【Dialogue I: //.2】<br>
                     I am Mary Hart. Um...are you an international student?
                   </li>
                 </ul>
@@ -540,11 +540,11 @@ <h3 id="l1-p2" class="workbook-title" data-keywords="ka、yes?、no?、is it?、
             </tr>
             <tr>
               <td><ruby>英訳<rt>えいやく</rt></ruby></td>
-              <td>か = yes?/no?/isn't it?/is it?</td>
+              <td>yes?; no?; isn't it?; is it?</td>
             </tr>
             <tr>
               <td><ruby>文型<rt>ぶんけい</rt></ruby></td>
-              <td>Sか</td>
+              <td>～か</td>
             </tr>
             <tr>
               <td><ruby>例文<rt>れいぶん</rt></ruby></td>
@@ -634,7 +634,7 @@ <h3 id="l1-p3" class="workbook-title" data-keywords="possessive、no、's、of">
               <td>
                 <ul>
                   <li>
-                    アリゾナだいがく<strong class="main-color">の</strong>がくせいです。【Dialogue II：//.2】<br>
+                    アリゾナだいがく<strong class="main-color">の</strong>がくせいです。【Dialogue II: //.2】<br>
                     I am a student <strong class="main-color">of</strong> the University of Arizona.
                   </li>
                 </ul>
@@ -646,7 +646,7 @@ <h3 id="l1-p3" class="workbook-title" data-keywords="possessive、no、's、of">
                 の is a particle that connects two nouns. The second noun provides the main idea and the first noun makes it more specific. It can be used like the possessive (Takeshi's) in English, as in the example below.
                 <div class="columns-2-in">
                   <div class="example"><span class="ul-color">たけしさん</span><strong class="main-color">の</strong>でんわばんごう</div>
-                  <div class="example"><span class="ul-color">Takeshi</span><strong class="main-color">'s</strong> phone number.</div>
+                  <div class="example"><span class="ul-color">Takeshi</span><strong class="main-color">'s</strong> phone number</div>
                 </div><br>
 
                 NounのNoun acts more or less like one big noun and can be put wherever you can put a noun, as in the following example.
@@ -658,11 +658,11 @@ <h3 id="l1-p3" class="workbook-title" data-keywords="possessive、no、's、of">
             </tr>
             <tr>
               <td><ruby>英訳<rt>えいやく</rt></ruby></td>
-              <td>NounのNoun = 's/of; indicates possessiveness</td>
+              <td>'s; of; indicates possessiveness</td>
             </tr>
             <tr>
               <td><ruby>文型<rt>ぶんけい</rt></ruby></td>
-              <td>NのN</td>
+              <td>N1のN2</td>
             </tr>
             <tr>
               <td><ruby>例文<rt>れいぶん</rt></ruby></td>
@@ -704,10 +704,74 @@ <h3 id="l1-p3" class="workbook-title" data-keywords="possessive、no、's、of">
           <br>
         </div>
 
-        <h2 id="lesson-grammar-2" class="lesson-title">Lesson 2: Coming Soon</h2>
+        <h2 id="lesson-grammar-2" class="lesson-title">Lesson 2: Shopping <span class="page-data">Genki I: p.60-64</span></h2>
         <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="placeholder" class="workbook-title"><em>Coming soon...</em></h3>
+          <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>
+          <table class="table grammar-table">
+            <tr>
+              <td><ruby>本文<rt>ほんぶん</rt></ruby></td>
+              <td>
+                <ul>
+                  <li>
+                    すみません。<strong class="main-color">これ</strong>はいくらですか。【Dialogue I: //.1】<br>
+                    Excuse me. How much is <strong class="main-color">this</strong>?
+                  </li>
+                  <li>
+                    <strong class="main-color">それ</strong>はさんぜんえんです。【Dialogue I: //.2】<br>
+                    <strong class="main-color">That</strong> is 3,000 yen.
+                  </li>
+                </ul>
+              </td>
+            </tr>
+            <tr>
+              <td><ruby>説明<rt>せつめい</rt></ruby></td>
+              <td>
+                これ, それ, and あれ are words used to refer to things without naming them based on their position relative to the speaker. これ refers to something close to the speaker ("this thing here"). それ refers to something far from the speaker, but close to the listener ("that thing in front of you"). あれ refers to something far from both the speaker and the listener ("that thing over there").
+                <div class="columns-2-in">
+                  <div class="example"><span class="ul-color">これ</span>はわたしのペンです。<br><small>(speaker is holding the pen)</small></div>
+                  <div class="example"><span class="ul-color">This</span> is my pen.</div>
+                </div>
+                <div class="columns-2-in">
+                  <div class="example"><span class="ul-color">それ</span>はわたしのペンです。<br><small>(speaker is pointing to the pen in the listener's hand)</small></div>
+                  <div class="example"><span class="ul-color">That</span> is my pen.</div>
+                </div>
+                <div class="columns-2-in">
+                  <div class="example"><span class="ul-color">あれ</span>はわたしのペンです。<br><small>(speaker is pointing to the pen far from both him and the listener.)</small></div>
+                  <div class="example"><span class="ul-color">That over there</span> is my pen.</div>
+                </div><br>
+
+                When asking about two or more things, you can use どれ for "which."
+                <div class="columns-2-in">
+                  <div class="example"><span class="ul-color">どれ</span>ですか。</div>
+                  <div class="example"><span class="ul-color">Which</span> one is it (that you are talking about)?</div>
+                </div>
+                <small>※ Question words like どれ and <ruby>何<rt>なに</rt></ruby> cannot be followed by the particle は. Instead, you must use the particle が to say something like, どれがあなたのペンですか。(Which one is your pen?)</small>
+              </td>
+            </tr>
+            <tr>
+              <td><ruby>英訳<rt>えいやく</rt></ruby></td>
+              <td>
+                これ = this<br>
+                それ = that<br>
+                あれ = that (over there)<br>
+                どれ = which
+              </td>
+            </tr>
+            <tr class="ex-list">
+              <td><ruby>練習<rt>れんしゅう</rt></ruby></td>
+              <td>
+                <ul>
+                  <li><a href="../../lesson-2/grammar-3/">Practice: これ／それ</a></li>
+                  <li><a href="../../lesson-2/grammar-4/">Practice: あれ</a></li>
+                  <li><a href="../../lesson-2/workbook-2/">Workbook: これ／それ／あれ</a></li>
+                </ul>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
         </div>
 
         <!--
@@ -717,14 +781,14 @@ <h2 id="lesson-grammar-1" class="lesson-title">Lesson 1:  <span class="page-data
           <h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
         </div>
 
-          <h3 id="l1-p" class="workbook-title" data-keywords="">.  <span class="page-data">Genki I: p.</span></h3>
+          <h3 id="l2-p" class="workbook-title" data-keywords="">.  <span class="page-data">Genki I: p.</span></h3>
           <table class="table grammar-table">
             <tr>
               <td><ruby>本文<rt>ほんぶん</rt></ruby></td>
               <td>
                 <ul>
                   <li>
-                    <strong class="main-color"></strong>【Dialogue I：//.】<br>
+                    <strong class="main-color"></strong>【Dialogue I: //.】<br>
                     
                   </li>
                 </ul>
@@ -759,7 +823,7 @@ <h3 id="l1-p" class="workbook-title" data-keywords="">.  <span class="page-data"
               <td><ruby>練習<rt>れんしゅう</rt></ruby></td>
               <td>
                 <ul>
-                  <li><a href="../../lesson-1/grammar-/">Practice:</a></li>
+                  <li><a href="../../lesson-2/grammar-/">Practice:</a></li>
                 </ul>
               </td>
             </tr>

diff --git a/lessons-3rd/index.html b/lessons-3rd/index.html
@@ -66,7 +66,6 @@ <h3 id="page-links">Page Links</h3>
           <span><a id="link-download" href="../download/"><i class="fa">&#xf019;</i>Download</a></span>
           <span><a id="link-donate" href="../donate/"><i class="fa">&#xf004;</i>Donate</a></span>
           <span><a id="link-github" href="https://github.com/SethClydesdale/genki-study-resources"><i class="fa">&#xf09b;</i>GitHub</a></span>
-          <br>
           <span><a id="link-settings" href="#genki-site-settings" onclick="GenkiSettings.manager(); return false;"><i class="fa">&#xf013;</i>Site Settings</a></span>
         </div>
 
@@ -1667,6 +1666,7 @@ <h2 id="appendix" class="lesson-title">Appendix (Genki II: p.348-389)</h2>
         <div class="lesson-exercises">
           <ul>
             <li><a href="appendix/dictionary/">Vocabulary Index (Dictionary)</a> (p.352-383)</li>
+            <li><a href="appendix/grammar-index/">Grammar Index</a></li>
             <li><a href="appendix/map-of-japan/">Map of Japan</a> (p.384-385)</li>
             <li><a href="appendix/numbers-chart/">Numbers Chart</a> (p.386-387)</li>
             <li><a href="appendix/conjugation-chart/">Conjugation Chart</a> (p.388-389)</li>

diff --git a/lessons-3rd/lesson-1/grammar-4/index.html b/lessons-3rd/lesson-1/grammar-4/index.html
@@ -80,7 +80,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
       Genki.generateQuiz({
         format : 'practice',
         type : ['multi', 'fill'],
-        info : ['Create questions and answers using the given cues. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.<br><br>'+
+        info : ['Create questions and answers using the given cues. {!GRI|Click here|l1-p2} to review Question Sentences.<br><br>'+
         '<table class="center">'+
           '<tr style="font-weight:bold">'+
             '<td></td>'+
@@ -117,7 +117,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
             '<td>22</td>'+
             '<td>47</td>'+
           '</tr>'+
-        '</table>', 'Create questions and answers using the given cues. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.'],
+        '</table>', 'Create questions and answers using the given cues. {!GRI|Click here|l1-p2} to review Question Sentences.'],
 
         quizlet : [
           [

diff --git a/lessons-3rd/lesson-1/grammar-5/index.html b/lessons-3rd/lesson-1/grammar-5/index.html
@@ -80,7 +80,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
       Genki.generateQuiz({
         format : 'practice',
         type : ['multi', 'fill'],
-        info : ['Create questions and answers for their age and year in school. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.<br><br>'+
+        info : ['Create questions and answers for their age and year in school. {!GRI|Click here|l1-p2} to review Question Sentences.<br><br>'+
         '<table class="center">'+
           '<tr style="font-weight:bold">'+
             '<td></td>'+
@@ -117,7 +117,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
             '<td>22</td>'+
             '<td>47</td>'+
           '</tr>'+
-        '</table>', 'Create questions and answers for their age and year in school. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.'],
+        '</table>', 'Create questions and answers for their age and year in school. {!GRI|Click here|l1-p2} to review Question Sentences.'],
 
         quizlet : [
           [

diff --git a/lessons-3rd/lesson-1/grammar-6/index.html b/lessons-3rd/lesson-1/grammar-6/index.html
@@ -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 chart about Mary\'s host family and answer the questions. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.<br><br>'+
+      info : ['Look at the chart about Mary\'s host family and answer the questions. {!GRI|Click here|l1-p2} to review Question Sentences.<br><br>'+
       '<table class="center">'+
         '<tr style="font-weight:bold">'+
           '<td></td>'+
@@ -101,7 +101,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
           '<td>23</td>'+
           '<td>16</td>'+
         '</tr>'+
-      '</table>', 'Look at the chart about Mary\'s host family and answer the questions. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.'],
+      '</table>', 'Look at the chart about Mary\'s host family and answer the questions. {!GRI|Click here|l1-p2} to review Question Sentences.'],
 
       quizlet : [
         [

diff --git a/lessons-3rd/lesson-1/grammar-8/index.html b/lessons-3rd/lesson-1/grammar-8/index.html
@@ -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 table below and describe each person using the given cues. {!GRI|Click here|l1-p3} if you need to review the grammar point for this exercise.<br><br>'+
+      info : ['Look at the table below and describe each person using the given cues. {!GRI|Click here|l1-p3} to review NounのNoun.<br><br>'+
       '<table class="center">'+
         '<tr style="font-weight:bold">'+
           '<td></td>'+
@@ -104,7 +104,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
           '<td>business<br><small>(ビジネス)</small></td>'+
           '<td>(Japanese teacher)</td>'+
         '</tr>'+
-      '</table>', 'Look at the table below and describe each person using the given cues. {!GRI|Click here|l1-p3} if you need to review the grammar point for this exercise.'],
+      '</table>', 'Look at the table below and describe each person using the given cues. {!GRI|Click here|l1-p3} to review NounのNoun.'],
 
       quizlet : [
         [

diff --git a/lessons-3rd/lesson-1/workbook-2/index.html b/lessons-3rd/lesson-1/workbook-2/index.html
@@ -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 asking and answering questions. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.',
+      info : 'Complete the following problems by asking and answering questions. {!GRI|Click here|l1-p2} to review Question Sentences.',
 
       quizlet : 
       '<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Look at the table below and complete the conversation.</p>'+

diff --git a/lessons-3rd/lesson-2/grammar-3/index.html b/lessons-3rd/lesson-2/grammar-3/index.html
@@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
     <script>Genki.generateQuiz({
       format : 'practice',
       type : ['multi', 'fill'],
-      info : 'Items 1-7 are near you, and items 8-14 are near your friend. Your friend asks what these things are called in Japanese. Pay attention to これ and それ as you answer the questions.',
+      info : 'Items 1-7 are near you, and items 8-14 are near your friend. Your friend asks what these things are called in Japanese. Pay attention to {!GRI|これ and それ|l2-p1} as you answer the questions.',
 
       quizlet : [
         [

diff --git a/lessons-3rd/lesson-2/grammar-4/index.html b/lessons-3rd/lesson-2/grammar-4/index.html
@@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
     <script>Genki.generateQuiz({
       format : 'practice',
       type : ['multi', 'fill'],
-      info : 'Your friend asks what the following places are called in Japanese. Answer the questions using あれ.',
+      info : 'Your friend asks what the following places are called in Japanese. Answer the questions using {!GRI|あれ|l2-p1}.',
 
       quizlet : [
         [

diff --git a/lessons-3rd/lesson-2/workbook-2/index.html b/lessons-3rd/lesson-2/workbook-2/index.html
@@ -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 これ, それ, or あれ.',
+      info : 'Complete the following problems using {!GRI|これ, それ, or あれ|l2-p1}.',
 
       quizlet : 
       '<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Look at the pictures and translate the sentences into Japanese.</p>'+

diff --git a/lessons/lesson-1/grammar-3/index.html b/lessons/lesson-1/grammar-3/index.html
@@ -79,7 +79,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
 
       Genki.generateQuiz({
         type : 'multi',
-        info : 'Look at the table below, then create answers and questions using the given cues. {!GRI|Click here|l1-p2} if you need to review the grammar point for this exercise.<br><br>'+
+        info : 'Look at the table below, then create answers and questions using the given cues. {!GRI|Click here|l1-p2} to review Question Sentences.<br><br>'+
         '<table class="center">'+
           '<tr style="font-weight:bold">'+
             '<td></td>'+