add new grammar points, update formatting

- updated formatting in various grammar points. - added new grammar points to the grammar index. (#295) - ～ている (Action in Progress)
SethClydesdale · Jan 17, 2025 · 4318c99 · 4318c99
1 parent bfb88e6
commit 4318c99
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 30 deletions.
diff --git a/lessons-3rd/appendix/grammar-index/index.html b/lessons-3rd/appendix/grammar-index/index.html
@@ -1077,11 +1077,11 @@ <h3 id="l2-p5" class="workbook-title" data-keywords="mo、too、also、as well
                     Yui is Japanese, <strong class="main-color">too</strong>.
                   </div>
                 </div>
-                As you can see above, the placement of も and "too" differ between Japanese and English. In Japanese, も comes right after the item that you want to say has the same property, usually replacing the particle (は、が…) or appearing alongside it (に). In this case, it's ゆいさん who shares being にほんじん with たけしさん.
-                <div class="example">
-                  A　は　X　です。　　A is X.<br>
-                  B　<strong class="main-color">も</strong>　X　です。　　B <strong class="main-color">too</strong> is X.
-                </div>
+                As you can see above, the placement of も and "too" differ between Japanese and English. In Japanese, も comes right after the item that you want to say has the same property, usually replacing the particle (は、が…) or appearing alongside it (に). In this case, it's ゆいさん who shares being にほんじん with たけしさん.<br>
+                <span class="box-color bg spaced">
+                 　 A　は　X　です。　　A is X.　<br>
+                 　 B　<strong class="main-color">も</strong>　X　です。　　B <strong class="main-color">too</strong> is X.　
+                </span><br>
                 Since も can only be used for properties that were mentioned by another, it cannot be used to say something like "I'm Japanese. I'm American, too." since it implies that someone else is American in addition to you. You have to use <a href="https://sethclydesdale.github.io/tobira-study-resources/lessons/appendix/grammar-index/#l12-p12" target="_blank">でもある</a> if you want to list out multiple properties that someone/something possesses.
               </td>
             </tr>
@@ -2429,11 +2429,11 @@ <h3 id="l4-p5" class="workbook-title" data-keywords="mo、too、also、as well
                     He read book at a cafe, <strong class="main-color">too</strong>.
                   </div>
                 </div>
-                The new item that is just like the first item introduced in the preceding sentence replaces the old item and usually everything that comes before に or で, then simply add も after the particle. In the examples above, you visited both Kyoto and Osaka, Sora came to school both on Saturday and Sunday, and so forth.
-                <div class="example">
-                  は／が／を　<i class="fa">&#xf061;</i>　も<br>
-                  に／で／etc.　<i class="fa">&#xf061;</i>　にも／でも／etc.
-                </div>
+                The new item that is just like the first item introduced in the preceding sentence replaces the old item and usually everything that comes before に or で, then simply add も after the particle. In the examples above, you visited both Kyoto and Osaka, Sora came to school both on Saturday and Sunday, and so forth.<br>
+                <span class="box-color bg spaced">
+                  　は／が／を　<i class="fa">&#xf061;</i>　も　<br>
+                  　に／で／etc.　<i class="fa">&#xf061;</i>　にも／でも／etc.　
+                </span>
               </td>
             </tr>
             <tr>
@@ -3032,10 +3032,9 @@ <h3 id="l5-p4" class="workbook-title" data-keywords="好きな、嫌いな、き
             <tr>
               <td><ruby>説明<rt>せつめい</rt></ruby></td>
               <td>
-                Some Japanese adjectives are like verbs in English, and they take a subject and an object. <ruby>好<rt>す</rt></ruby>き(な) (to be fond of; to like), and きらい(な) (to be disgusted with; to dislike) are two examples of this. If you like something or somebody, for example, <ruby>私<rt>わたし</rt></ruby>は will be the subject and the object of your affection will be Yが.
-                <div class="example">
-                  XはYが{<ruby>好<rt>す</rt></ruby>き/きらい}です。 =　X {likes/dislikes} Y.
-                </div>
+                Some Japanese adjectives are like verbs in English, and they take a subject and an object. <ruby>好<rt>す</rt></ruby>き(な) (to be fond of; to like), and きらい(な) (to be disgusted with; to dislike) are two examples of this. If you like something or somebody, for example, <ruby>私<rt>わたし</rt></ruby>は will be the subject and the object of your affection will be Yが.<br>
+                <span class="box-color bg spaced">　XはYが{<ruby>好<rt>す</rt></ruby>き/きらい}です。 =　X {likes/dislikes} Y.　</span><br>
+
                 <div class="columns-2-in">
                   <div class="example">ロバートさんは<ruby>日本語<rt>にほんご</rt></ruby>のクラスが<strong class="main-color"><ruby>好<rt>す</rt></ruby>き</strong>です。</div>
                   <div class="example">Robert <strong class="main-color">likes</strong> his Japanese classes.</div>
@@ -3105,7 +3104,7 @@ <h3 id="l5-p4" class="workbook-title" data-keywords="好きな、嫌いな、き
             </tr>
           </table><br>
 
-          <h3 id="l5-p5" class="workbook-title" data-keywords="mashouka、let's、let us、shall we、shall I、suggestion">5. ～ましょう/ましょうか <span class="page-data">Genki I: p.136</span></h3>
+          <h3 id="l5-p5" class="workbook-title" data-keywords="mashouka、let's、let us、shall we、suggestion">5. ～ましょう/ましょうか <span class="page-data">Genki I: p.136</span></h3>
           <table class="table grammar-table">
             <tr>
               <td><ruby>本文<rt>ほんぶん</rt></ruby></td>
@@ -3128,7 +3127,7 @@ <h3 id="l5-p5" class="workbook-title" data-keywords="mashouka、let's、let us
               <td><ruby>英訳<rt>えいやく</rt></ruby></td>
               <td>
                 ～ましょう = let's<br>
-                ～ましょうか = shall we/I?
+                ～ましょうか = shall we?
               </td>
             </tr>
             <tr>
@@ -3363,6 +3362,7 @@ <h3 id="l6-p1" class="workbook-title" data-keywords="て、verb conjugation、ru
                   <li><a href="../../lesson-6/grammar-1/">Practice: Te-form Conjugation</a></li>
                   <li><a href="../../lesson-6/workbook-1/">Workbook: Te-form Conjugation 1</a></li>
                   <li><a href="../../lesson-6/workbook-2/">Workbook: Te-form Conjugation 2</a></li>
+                  <li><a href="../../lesson-7/workbook-1/">Workbook: Te-form Conjugation - Lesson 7</a></li>
                 </ul>
               </td>
             </tr>
@@ -3631,10 +3631,8 @@ <h3 id="l6-p6" class="workbook-title" data-keywords="kara、because、since、re
             <tr>
               <td><ruby>説明<rt>せつめい</rt></ruby></td>
               <td>
-                A sentence that ends with から (because) explains the reason or the cause of a situation, a proposal, and so forth.
-                <div class="example">
-                  (situation)。(explanation)から。
-                </div>
+                A sentence that ends with から (because) explains the reason or the cause of a situation, a proposal, and so forth.<br>
+                <span class="box-color bg spaced">　(situation)。(explanation)から。　</span><br>
 
                 <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>
@@ -3755,7 +3753,115 @@ <h2 id="lesson-grammar-7" class="lesson-title">Lesson 7: Family Picture (<ruby>
         </div>
         <div class="center"><button id="toggler-7" class="button grammar-toggler" onclick="GRIndex.toggle(this, 7);"><i class="fa">&#xf07c;</i>Show Grammar Points</button></div>
         <div id="exercises-7" class="lesson-exercises">
-          <br><h3 id="placeholder" class="workbook-title"><em>Coming soon...</em></h3>
+          <h3 id="l7-p1" class="workbook-title" data-keywords="teiru、...-ing、habitual action、occupation">1. ～ている (Action in Progress) <span class="page-data">Genki I: p.170-171</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>
+                  </li>
+                </ul>
+              </td>
+            </tr>
+            <tr>
+              <td><ruby>説明<rt>せつめい</rt></ruby></td>
+              <td>
+                The te-form of a verb that describes an action (e.g., <ruby>食<rt>た</rt></ruby>べる、<ruby>読<rt>よ</rt></ruby>む) together with the helping verb いる can be used to describe <em>actions in progress</em>.<br>
+                <span class="box-color bg spaced">　Action verbs + ている = action in progress　</span><br>
+
+                <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">Sora is study<strong class="main-color">ing</strong> right now.</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">Takeshi is read<strong class="main-color">ing</strong> a book in English.</div>
+                </div>
+                <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">What are you <strong class="main-color">doing</strong> right now?</div>
+                </div>
+                <br>
+
+                You can also use ～ています to describe what a person does habitually or by occupation.
+                <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 teach English. / I am teach<strong class="main-color">ing</strong> English (right now).</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">Mary stud<strong class="main-color">ies</strong> Japanese every day.</div>
+                </div>
+                The first example has two interpretations: you are actually teaching English right at this moment, or you are an English-language teacher (but are not necessarily in class right now). The second example means that Mary is in the habit of studying Japanese every day (but of course she does not spend 24 hours a day doing so).<br><br>
+
+                The helping verb いる conjugates as a ru-verb, so it has the following long forms.
+                <table class="table alt-cell-color">
+                  <tr class="table-head">
+                    <td><span class="main-color">e.g.</span> <ruby>食<rt>た</rt></ruby>べ<span class="ul-color">ている</span></td>
+                    <td>affirmative</td>
+                    <td>negative</td>
+                  </tr>
+                  <tr>
+                    <td>[Present]</td>
+                    <td>
+                      <ruby>食<rt>た</rt></ruby><span class="ul-color">ています</span><br>
+                      He is eating.
+                    </td>
+                    <td>
+                      <ruby>食<rt>た</rt></ruby><span class="ul-color">ていません</span><br>
+                      He is not eating.
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>[Past]</td>
+                    <td>
+                      <ruby>食<rt>た</rt></ruby><span class="ul-color">ていました</span><br>
+                      He was eating.
+                    </td>
+                    <td>
+                      <ruby>食<rt>た</rt></ruby><span class="ul-color">ていませんでした</span><br>
+                      He was not eating.
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td><ruby>英訳<rt>えいやく</rt></ruby></td>
+              <td>...-ing (as in doing, eating, etc.); (indicates habitual action)</td>
+            </tr>
+            <tr>
+              <td><ruby>文型<rt>ぶんけい</rt></ruby></td>
+              <td>Action verb+ている</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">Hold on, I'm eat<strong class="main-color">ing</strong> right now.</div>
+                    </div>
+                  </li>
+                </ol>
+              </td>
+            </tr>
+            <tr class="ex-list">
+              <td><ruby>練習<rt>れんしゅう</rt></ruby></td>
+              <td>
+                <ul>
+                  <li><a href="../../lesson-7/grammar-1/">Practice: ～ている (Actions in Progress)</a></li>
+                  <li><a href="../../lesson-7/workbook-2/">Workbook: ～ている (Actions in Progress)</a></li>
+                </ul>
+              </td>
+            </tr>
+          </table><br>
+
+          <br><h3 id="placeholder" class="workbook-title"><em>More coming soon...</em></h3>
         </div>
 
         <!--

diff --git a/lessons-3rd/lesson-7/grammar-1/index.html b/lessons-3rd/lesson-7/grammar-1/index.html
@@ -79,7 +79,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
       Genki.generateQuiz({
         format : 'practice',
         type : ['multi', 'fill'],
-        info : ['What is Mary doing? Read the cues and choose the correct description.', 'What is Mary doing? Read the cues and answer the questions.'],
+        info : ['What is Mary doing? Read the cues and choose the correct description. {!GRI|Click here|l7-p1} to review ～ている (Actions in Progress).', 'What is Mary doing? Read the cues and answer the questions. {!GRI|Click here|l7-p1} to review ～ている (Actions in Progress).'],
 
         quizlet : [
           [

diff --git a/lessons-3rd/lesson-7/workbook-1/index.html b/lessons-3rd/lesson-7/workbook-1/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 : 'Practice identifying and conjugating the following verbs.',
+      info : 'Practice identifying and conjugating the following verbs. {!GRI|Click here|l6-p1} to review Te-form conjugation.',
 
       quizlet : 
       '<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>Identify the verbs as u, ru, or irregular verbs and fill in the table below.</p>'+

diff --git a/lessons-3rd/lesson-7/workbook-2/index.html b/lessons-3rd/lesson-7/workbook-2/index.html
@@ -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 : 'Practice describing actions that are in progress, using ～ている.',
+      info : 'Practice describing actions that are in progress, using {!GRI|～ている|l7-p1}.',
 
       quizlet : 
       '<div class="count-problems">'+
-        '<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Describe the following actions, using ～ています.</p>'+
+        '<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Describe the following actions, using {!GRI|～ています|l7-p1}.</p>'+
         '<div class="problem">'+
           'singing a song<br>'+
           '{歌を歌っています|うたをうたっています|answer}。'+

diff --git a/lessons/lesson-7/grammar-1/index.html b/lessons/lesson-7/grammar-1/index.html
@@ -78,7 +78,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
 
       Genki.generateQuiz({
         type : 'multi',
-        info : 'What is Mary doing? Read the cues and choose the correct description in Japanese.',
+        info : 'What is Mary doing? Read the cues and choose the correct description in Japanese. {!GRI|Click here|l7-p1} to review ～ている (Actions in Progress).',
 
         quizlet : [
           {

diff --git a/lessons/lesson-7/workbook-1/index.html b/lessons/lesson-7/workbook-1/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 : 'Decide whether they are u-, ru-, or irregular verbs and fill in the table below.',
+      info : 'Decide whether they are u-, ru-, or irregular verbs and fill in the table below. {!GRI|Click here|l6-p1} to review Te-form conjugation.',
 
       quizlet : 
       '<table class="table large-width center">'+

diff --git a/lessons/lesson-7/workbook-2/index.html b/lessons/lesson-7/workbook-2/index.html
@@ -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 : 'Practice describing actions that are in progress, using ～ている.',
+      info : 'Practice describing actions that are in progress, using {!GRI|～ている|l7-p1}.',
 
       quizlet : 
       '<div class="count-problems">'+
-        '<p class="section-desc">Describe the following actions, using ～ている.</p>'+
+        '<p class="section-desc">Describe the following actions, using {!GRI|～ている|l7-p1}.</p>'+
         '<div class="problem">'+
           'Making a phone call<br>'+
           '{電話をかけています|でんわをかけています|answer}。'+

diff --git a/resources/css/stylesheet.css b/resources/css/stylesheet.css
@@ -202,6 +202,11 @@ input[type="text"]:focus, input[type="number"]:focus, textarea:focus, select:foc
   padding:3px;
   margin:3px;
 }
+.box-color.spaced {
+  margin:10px 3px;
+}
+.box-color.bg { background:#FFF; }
+.dark-mode .box-color.bg { background:#161616; }
 
 .inline { display:inline-block; }
 .t-valign-top { vertical-align:top; }

diff --git a/resources/css/stylesheet.min.css b/resources/css/stylesheet.min.css