commit bfa8c182b887b2c7afcc5a3d8ee75672574870fe Author: Marvin Johanning Date: Tue Apr 26 14:29:14 2022 +0200 Initial commit# diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b6a732 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*.gem +.bundle +.DS_Store +.sass-cache +_site +Gemfile.lock +.jekyll-cache diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..e2d5a08 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at chesterhow@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7b662f8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" +gemspec +gem "webrick" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c7dc8ee --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Chester How + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3e7903f --- /dev/null +++ b/README.md @@ -0,0 +1,132 @@ +# Tale + +[![Gem Version](https://badge.fury.io/rb/tale.svg)](https://badge.fury.io/rb/tale) + +Tale is a minimal Jekyll theme curated for storytellers. Checkout the demo [here](https://chesterhow.github.io/tale/). + +![Tale screenshot](http://i.imgur.com/pXZrtmo.png) + +## Features +- Easy installation +- Compatible with GitHub Pages +- Responsive design (looks just as good on mobile) +- Syntax highlighting, with the help of Pygments +- Markdown and HTML text formatting +- Pagination of posts +- Sticky posts +- Tags +- Excerpt management +- [Disqus comments (can be enabled if needed)](#enabling-comments) + +## Installation +There are 3 ways to install this theme + +1. Install it as a Ruby Gem (for self-hosted sites) +2. Install it with the `jekyll-remote-theme` plugin (for GitHub Pages hosted sites) +3. Fork the project directly + +### Ruby Gem method +1. Add this line to your `Gemfile`: + +```ruby +gem "tale" +``` + +2. Install the theme's gems and dependencies: + +```bash +$ bundle +``` + +3. In `_config.yml` add these lines: + +```yaml +theme: tale + +permalink: /:year-:month-:day/:title +paginate: 5 +``` + +Remove any other `theme:` lines. + +4. Rename `index.md` to `index.html`. Without this, the `jekyll-paginate` gem will not work. + +5. In `about.md`, change the `layout:` field to `post`: + +```Markdown +layout: post +``` + +### GitHub Pages method +1. Add these 2 lines in to your `Gemfile`: + +```ruby +gem "jekyll-remote-theme" +gem "jekyll-paginate" +``` + +2. Install the newly added gems: + +```bash +$ bundle +``` + +3. In `_config.yml` add these lines: + +```yaml +remote_theme: chesterhow/tale + +permalink: /:year-:month-:day/:title +paginate: 5 + +plugins: + - jekyll-paginate + - jekyll-remote-theme +``` + +Remove any other `theme:` or `remote_theme:` lines. + +4. Rename `index.md` to `index.html`. Without this, the `jekyll-paginate` gem will not work. + +5. In `about.md`, change the `layout:` field to `post`: + +```Markdown +layout: post +``` + +### Fork method +1. Fork this repository + +2. Delete the unnecessary files/folders: `CODE_OF_CONDUCT.md`, `LICENSE`, `README.md`, `tale.gemspec` + +3. Delete the `baseurl` line in `_config.yml`: + +```yaml +baseurl: "/tale" # delete this line +``` + +## Usage +Once you've installed the theme, you're ready to work on your Jekyll site. To start off, I would recommend updating `_config.yml` with your site's details. + +To build and serve your site, run: + +```bash +$ bundle exec jekyll serve +``` + +And you're all set! Head over to http://127.0.0.1:4000/ to see your site in action. + +### Enabling Comments +Comments are disabled by default. To enable them, look for the following line in `_config.yml` and change `jekyll-tale` to your site's Disqus id. + +```yml +disqus: jekyll-tale +``` + +Next, add `comments: true` to the YAML front matter of the posts which you would like to enable comments for. + +## Contributing +Found a bug or have a suggestion? Feel free to create an issue or make a pull request! + +## License +See [LICENSE](https://github.com/chesterhow/tale/blob/master/LICENSE) diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..78f2e83 --- /dev/null +++ b/_config.yml @@ -0,0 +1,40 @@ +# Site settings +title: Tagalog diary ni Marvin đŸ‡”đŸ‡­ +description: "My diary / blog regarding my learning of Tagalog" +url: "https://chesterhow.github.io" + +# Google Analytics +google_analytics: UA—XXXXXXXX-X + +# Author +author: + name: Chester How + url: https://chester.how + email: chesterhow@gmail.com + +# Build settings +markdown: kramdown +include: + - _pages + +# Assets +sass: + sass_dir: _sass + style: compressed + +# Gems +plugins: + - jekyll-feed + - jekyll-paginate + - jekyll-seo-tag + # - jemoji #Uncomment this to allow emoji in your post + +# Permalinks +permalink: /:year-:month-:day/:title +paginate: 5 + +# Excludes +exclude: [ Gemfile, Gemfile.lock, tale.gemspec ] + +# Disqus (Set to your disqus id) +disqus: jekyll-tale diff --git a/_includes/analytics.html b/_includes/analytics.html new file mode 100644 index 0000000..743d1fc --- /dev/null +++ b/_includes/analytics.html @@ -0,0 +1,6 @@ + + diff --git a/_includes/catalogue_item.html b/_includes/catalogue_item.html new file mode 100644 index 0000000..f060c59 --- /dev/null +++ b/_includes/catalogue_item.html @@ -0,0 +1,19 @@ + +
+ {% if include.sticky == 'true' %} + Pinned · + {% endif %} + +

{{ post.title }}

+
+ +

+ {% if post.excerpt_separator %} + {{ post.excerpt | strip_html }} + {% else %} + {{ post.content | strip_html | truncatewords: 30 }} + {% endif %} +

+ +
+ diff --git a/_includes/disqus_comments.html b/_includes/disqus_comments.html new file mode 100644 index 0000000..4b06c13 --- /dev/null +++ b/_includes/disqus_comments.html @@ -0,0 +1,11 @@ + + +

Discussion and feedback

+
+ + + \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html new file mode 100644 index 0000000..729a53d --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,5 @@ + diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 0000000..6e7d61d --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,23 @@ + + + + + {% seo %} + + + + + + + + + + + + {% feed_meta %} + + + {% if site.google_analytics and jekyll.environment == 'production' %} + {% include analytics.html %} + {% endif %} + diff --git a/_includes/navigation.html b/_includes/navigation.html new file mode 100644 index 0000000..67f7ac6 --- /dev/null +++ b/_includes/navigation.html @@ -0,0 +1,12 @@ + diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 0000000..8c8261e --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,16 @@ + + + + {% include head.html %} + + + + {% include navigation.html %} + +
+ {{ content }} +
+ + {% include footer.html %} + + diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 0000000..18766f7 --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,26 @@ +--- +layout: default +--- + +
+ {% for post in site.posts %} + {% if post.sticky %} + {% include catalogue_item.html sticky='true' %} + {% endif %} + {% endfor %} + + {% for post in paginator.posts %} + {% include catalogue_item.html %} + {% endfor %} +
+ + diff --git a/_layouts/post.html b/_layouts/post.html new file mode 100644 index 0000000..82d9079 --- /dev/null +++ b/_layouts/post.html @@ -0,0 +1,39 @@ +--- +layout: default +--- + +
+
+ Written by + {% if page.author %} + {{ page.author }} + {% else %} + {{ site.author.name }} + {% endif %} + + {% if page.date %} +
+ on  + {% endif %} +
+ +

{{ page.title }}

+
+ + {{ content }} +
+ +{% if page.comments %} + {% include disqus_comments.html %} +{% endif %} + + \ No newline at end of file diff --git a/_pages/404.html b/_pages/404.html new file mode 100644 index 0000000..0402467 --- /dev/null +++ b/_pages/404.html @@ -0,0 +1,15 @@ +--- +layout: default +title: "404" +permalink: /404.html +--- + +
+

404: Page not found

+
+

+ Oops! We can't seem to find the page you are looking for. Let's + head back home. +

+

+
diff --git a/_pages/about.md b/_pages/about.md new file mode 100644 index 0000000..cc78f65 --- /dev/null +++ b/_pages/about.md @@ -0,0 +1,8 @@ +--- +layout: post +title: "About" +author: "Marvin Johanning" +permalink: /about/ +--- + +Hello and welcome to my blog / diary! I am currently studying Tagalog as my SO speaks it as their native language and I am writing this diary in order to record my progress and help me better retain the information that I study. diff --git a/_pages/tags.html b/_pages/tags.html new file mode 100644 index 0000000..6de6eea --- /dev/null +++ b/_pages/tags.html @@ -0,0 +1,53 @@ +--- +layout: default +title: "Tags" +permalink: /tags/ +--- + +
+
+

{{ page.title }}

+
+
+
+ {% for tag in site.tags %} + {{ tag[0] }} + {% endfor %} +
+ {% for tag in site.tags %} +
+ + + + +

{{ tag[0] }}

+ {% for post in tag[1] %} + +
+ {{ post.title }} +
+
+ + + + + {% endfor %} +
+ {% endfor %} +
diff --git a/_posts/2022-04-21-Diary.md b/_posts/2022-04-21-Diary.md new file mode 100644 index 0000000..5b56ebf --- /dev/null +++ b/_posts/2022-04-21-Diary.md @@ -0,0 +1,53 @@ +--- +title: Let the studying begin +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-21 +This is my first diary entry. I hope to publish a new entry every day. + + +--- +## Tasks +- [x] Finish at least lesson 12 +- [x] Learn some more vocabulary +- [x] Speak / chat a bit + +--- +## Colours +- Word root +- Infix or root repetition +- Prefix + +--- +## Interesting new words +* ipakilĂĄla (loc.) â†Ș to introduce + * kilalĂĄ (adj.) â†Ș well-known, familar, famous, popular + * Unknown and new conjugation (*ipa-* verb) + * ipakilĂĄla, ipinakilĂĄla, ipinakikilĂĄla, ipakikilĂĄla + * The word that was used for the phrase “It is a pleasure to meet you” has the same root but a different prefix, hence its meaning is somewhat different from *ipakilala* + * makilĂĄla (obj.) â†Ș to meet / get to know someone +* namĂĄn (enclitic, adverb) â†Ș so, likewise, emphasis + * It can mean “likewise” or ”so” depending on context + * It can, however, also be used to emphasise the speaker’s feelings + * magsalita ka naman â†Ș “Please say something” + +--- +## What was most difficult? +The most difficult part was the new verb. + +--- +## What was learnt? +The main theme of the lesson was introducing someone to someone else. It introduces a new verb, *ipinakilala*, but does, unfortunately, not really introduce verb conjugations yet. According to tagalog.com, it appears to be a locative verb (which makes sense, as you are introducing someone _to_ someone else) and the conjugation appears mostly straightforward: — + +| Infinitive | Past | Present | Future | +| ---------- | --------- | ----------- | -------- | +| iparoot | ipinaroot | ipinaroroot | iparoroot | + +Additionally, it uses the _ko_ form of the first person singular pronoun, not the _ako_. I believe this to be the case with all non-actor focussed verbs, at least it has been this case with all the verbs I have so far come across. Therefore, the person being introduced is in the _ang_ form: Ipinakikilala ko sa iyo ang aking ama. + +_iyo_ is "to you / yours" and, combined with _sa_, often turns into _sa’yo_ for short. The plural form would be _inyo_. +- _Ipinakikilala ko sa iyo sina Angel, Tony at si Chris, mga kaibigan ko._ + - Introducing-am I to you (person marker plural) Angel, Tony and (person marker singular) Chris, (plural marker) friends mo diff --git a/_posts/2022-04-22-Diary.md b/_posts/2022-04-22-Diary.md new file mode 100644 index 0000000..7ef8fec --- /dev/null +++ b/_posts/2022-04-22-Diary.md @@ -0,0 +1,28 @@ +--- +title: Learning how to say “from” +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-22 +I am currently in Bavaria, but that will not keep me from studying Tagalog! However, as was doing a lot of things today, this diary entry will be much shorter than the previous one. + + +--- +## Tasks +- [x] Finish at least lesson 13 +- [x] Study more vocab +- [x] Speak / write a bit + +--- +## Interesting new words +This lesson was, unfortunately, rather sparse on new words. The most interesting one would have go be _gĂĄling (sa)_ which means “from”. An example sentence would be: “Gusto kong bumilin pagkain galing sa Burger King”. + +--- +## What was most difficult? +There were no really difficult bits in lesson 13. The dialogue was very short and contained only short and simple sentences. + +--- +## What was learnt? +This lesson’s focus was on giving and receiving gifts. The main (and informal) way of doing so is by simply saying the following: _Heto, pasalubong galing sa Pilipinas para sa’yo_, “Look / here, a souvenir from the Philippines for you.” This can be replied to with _Nag-abala ka pa!_, which the course notes translate as ”You shouldn’t have!“. Mag-abala appears to be a regular actor-focussed verb of the _mag-_ variety which means ”to bother / worry about / trouble (oneself).“ Its root, _abalĂĄ_ means ”busy, occupied, preoccupied, focussed on“. \ No newline at end of file diff --git a/_posts/2022-04-23-Diary.md b/_posts/2022-04-23-Diary.md new file mode 100644 index 0000000..f40342c --- /dev/null +++ b/_posts/2022-04-23-Diary.md @@ -0,0 +1,42 @@ +--- +title: This and that — and linker words +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-23 +I am currently on the train on my way back to Bielefeld. I had a very nice time in Bavaria! As I will have a lot of time on my hand on the journey back home, I will also have a lot more opportunity to study some Tagalog. + + +--- +## Tasks +- [x] Finish at least lesson 14 +- [x] Learn some vocabulary +- [x] Speak / write a bit + +--- +## Interesting new words +- **ito, iyan, iyon** + - Lesson 13 introduced a handful of new demonstrative pronouns, namely _ito_, _iyan_ and _iyon_. + - _ito_ is used for things that are close to both the speaker and the listener (as in “this”) + - _iyan_ is used for things that closer to the listener (similar to “this“) + - _iyon_ is used for things that are not close to either listener or speaker (“that“) +- **-ng, na** + - These have cropped up in other lessons before, but because it was talked about somewhat more extensively in this lesson, I decided to take a more thorough look at what exactly they are. + - They appear to be what is referred to as _linking particles_ + - One common usage for them is their linking of an adjective to the noun it is describing (including numbers) + - mabait na babae, magandang babae, isang babae + - _na_ is used in words ending in a consonant + - _-ng_ is used for words ending in a vowel + - It can also, depending on context, be translated as ”who, which, what” + - asong tumalon (“the dog that jumped”), batang kumanta (“the child that sang”) + +--- +## What was most difficult? +Lesson fourteen was, once more, rather straightforward. The only thing I had some trouble with was the _-ng, na_ linkers, but some googling helped clear that up. Getting used to the different demonstrative pronouns will also take some practice, but I do not think it will be all too difficult. + +--- + +## What was learnt? +Lesson fourteen taught me how to ask whether A is B, such as “Is this umbrella expensive?” (_Mahal ba itong payong?_). Additionally, it also taught a handful of new pronouns and words for common Filipino condiments, _suka_ (“vinegar”) and _patis_ (a type of fish sauce). \ No newline at end of file diff --git a/_posts/2022-04-24-Diary.md b/_posts/2022-04-24-Diary.md new file mode 100644 index 0000000..5f8864c --- /dev/null +++ b/_posts/2022-04-24-Diary.md @@ -0,0 +1,47 @@ +--- +title: Let’s eat! — And questions about ang +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-24 +I want to finish a couple more lessons today, as it’s a Sunday and I don’t really have anything else to do anyway. + + +--- +## Tasks +- [x] Finish lesson 15 +- [x] Finish lesson 16 +- [x] Learn about ang / ng more thoroughly +- [x] Speak / write a bit +- [x] Take Level 1 Practice Test 5 +- [x] Learn vocabulary + +--- +## Interesting new words +- __mukhĂĄng__ + - an adjective that translates to “it seems” or “it looks” + - _Mukhang uulan ngayon_ (“It seems that it will rain today”) + - _Mukhang masarap ito_ (“It looks delicious”) +- __kainan na__ + - not really a word but rather an expression or interjection + - it means “let’s eat!” + +--- +## What was most difficult? +The notes for lesson 15 include some information regarding _ang_, but describe it as “an article which functions similarly to ‘the.’ This article marks that the word or words next to it or after it are the subject of the sentence, which can be a noun or an adjective”. I find this somewhat confusing, as _ang_ is not always equivalent to the English definite article. +Additionally, the notes also state that when _mo_ follows “a verb, it functions as the pronoun ‘you’”; this is correct, but not all verbs take _mo_. For example, the sentence _Iinom ka ba ng tsaa?_ means “Will you drink tea?” and it uses _ka_ instead of _mo_. This appears to be a difference between the so-called _ang_ version of the pronoun and the _ng_ version. + +Lesson 16 was more straightforward and there wasn’t really anything that was difficult there. + +--- +## What was learnt? +The main theme of lesson fifteen was asking whether something belongs to someone. The structure for that kind of question is rather simple and goes as follows: “noun mo ba ito?” (“Is this your noun?”), wherein _mo_ and _ito_ can be replaced with a different (demonstrative) pronoun (_Bahay ko ba iyan?_, “Is that my house?”). +As mentioned above, however, it also states that _mo_ functions as the pronoun “you” when followed by a verb; but as I know, not every verb takes _mo_, as some actually take _ko_. +This lead me to want to research more about the differences between these two sets of pronouns and as it turns out, the verb determines what set of pronouns is used; actor-focus verbs require the actor to be in the _ng_ form (“ako“, “ka”) and the object in the _ang_ form (“ko”, “mo”) whereas object-focus verbs are the other way around. I am hoping that this will be explained more thoroughly in the upcoming lessons. + +Lesson sixteen’s main theme was the teaching of how to ask what something is, “Ano ba ito?” (“What is this?”). Additionally, a new word — _mukhang_ — was taught, that can be used to say things such as “it seems delicious”. + +I also took the Level 1 Practice Test 5 and scored 100%. +![[Screenshot 2022-04-24 at 16.52.11.png]] \ No newline at end of file diff --git a/_posts/2022-04-25-Diary.md b/_posts/2022-04-25-Diary.md new file mode 100644 index 0000000..0f11760 --- /dev/null +++ b/_posts/2022-04-25-Diary.md @@ -0,0 +1,53 @@ +--- +title: A more grammar heavy day — -um- verbs +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-25 +The previous lessons have honestly been rather boring, as they didn’t really introduce a lot of new grammatical concepts — this time, however, I will finally learn some more grammar! + + +--- +## Tasks +- [x] Finish lesson 17 +- [ ] Maybe finish lesson 18 +- [x] Learn some vocab +- [x] Speak / write a bit +- [x] Watch a couple more videos + +--- +## Colours +- Word root +- Infix or root repetition +- Prefix + +--- +## Interesting new words +- __gawa sa__ + - a preposition meaning “made of” or “out of” + - _Ang adobo ay __gawa sa__ manok_, “Adobo is made out of chicken” +- __maari__ (also “maaari”) + - an adjective that can be used for saying “can” or “may” + - ___Maaari__ ka bang kumain ng manok?_, “Can you eat chicken?“ + - ___Maaari__ ba akong magtanong?_, “Can I ask a question?“ + - it can also be used for saying things like “could” + - ___Maaaring__ tama si John_, “John could be right” + +--- +## What was most difficult? +The most difficult aspect of lesson seventeen was the newly introduced _maaari_. It appears to require the usage of _-ng_ to link it to the rest of the sentence, so I need to practice its placement a bit more thoroughly. Additionally, this lessons _somewhat_ introduces -um- verbs, albeit in a rather haphazardly fashion. + +--- +## What was learnt? +The main theme of lesson seventeen learning how to ask whether someone can or wants do do a certain thing. A few examples include _Kumakain ka ba ng manok_, _Maaari ka bang sumayaw_ and _Sumasayaw ka ba?_. Additionally, a new preposition (_gawa sa_) was taught that means “made from / of / in“. It can be used in sentences such as _Ang sushi na iyan ay gawa sa isda_ or _Ang mga damit na iyan ay gawa sa Amerika_. +It also teaches a new interjection, namely _Ang sarap_. This can be used when wanting to proclaim that the food currently being eating is very nice, but it can also be used for other situations during which the speaker is satisified. + +This is also the first lesson that talks about verbs, namely -um- verbs; it does, however, not talk about them in a very thorough manner and contain a couple of things I found to be wrong. Firstly, it proclaims that the verb _kumain_ in Maari ka bang kumain ng manok is in the past tense, whereas it is actually in the infinitive. It is true that the infinitive and past tenses (or rather the completed aspect) actually use the same verb form with -um- verbs, but saying that the “past tense” is being used is rather misleading. It correctly states, however, that the present tense (or continuous aspect) is used when saying Kumakainka ba ng manok. + +I have taken a short peak at the upcoming lessons and have noticed that there will be a handful of lessons regarding both mag- and -um- verbs shortly. I will, therefore, not dwell on this topic further. + +The videos I have been watching haven’t really taught me anything new, but that was not the point in watching them anway; I have been watching them as they give me a bit more input and help me better absorb all the new information I have been learning. + +And lastly, through my chatting with my boyfriend, I learnt a handful of new words, amongst which are _mag-usap_ for “to speak” (_mag-uusap tayo bukas_) and _maghintay_ for “to wait” (_naghihintay ako para sa aking oven_). I also learnt from him that the Taglog word for “bed” is _kama_ from the Spanish word _cama_. \ No newline at end of file diff --git a/_posts/2022-04-26-Diary.md b/_posts/2022-04-26-Diary.md new file mode 100644 index 0000000..edad275 --- /dev/null +++ b/_posts/2022-04-26-Diary.md @@ -0,0 +1,39 @@ +--- +title: Tagalog Diary 2022-04-26 +layout: post +author: "Marvin Johanning" +excerpt_separator: +--- + +# Tagalog Diary — 2022-04-26 +Mabuhay! Nagtatrabaho ako sa bahay sa araw na ito. Naghintay ako ng aking oven. Nag-install ang electrician ng oven. Makakabake ako ng mga pretzel o ng mga isda ngayon! Binili ko ang whisky gawa sa Amerika. Gusto kong mag-aral ng mga numero ngayon. + + + +I have a bit more time on my hand today — due to my working from home — and, therefore, I decided I will try to study a bit more today. I will be watching videos, trying to finish lessons 18 and 19 and study numbers in Tagalog. + +--- +## Colours +- Word root +- Infix or root repetition +- Prefix + +--- +## Tasks +- [ ] Finish lesson 18 +- [ ] Maybe finish lesson 19 +- [ ] Watch a few more videos +- [ ] Speak / write a bit +- [ ] Learn vocab (especially numbers) + +--- +## Interesting new words or expressions +- + +--- +## What was most difficult? + +--- +## What was learnt? + + diff --git a/_sass/tale.scss b/_sass/tale.scss new file mode 100644 index 0000000..007fa5a --- /dev/null +++ b/_sass/tale.scss @@ -0,0 +1,10 @@ +@import 'tale/variables'; +@import 'tale/base'; +@import 'tale/code'; +@import 'tale/post'; +@import 'tale/syntax'; +@import 'tale/layout'; +@import 'tale/pagination'; +@import 'tale/catalogue'; +@import 'tale/404'; +@import 'tale/tags'; \ No newline at end of file diff --git a/_sass/tale/_404.scss b/_sass/tale/_404.scss new file mode 100644 index 0000000..4b8fce3 --- /dev/null +++ b/_sass/tale/_404.scss @@ -0,0 +1,22 @@ +.notfound { + position: relative; + text-align: center; + margin: 4rem 0; + + &-error { + font-size: 4rem; + margin: 1rem 0; + } + + &-line { + border-top: 0.4rem solid $default-shade; + display: block; + margin: 0 auto 3rem; + width: 4rem; + } + + &-message { + max-width: 25rem; + margin: 0 auto; + } +} diff --git a/_sass/tale/_base.scss b/_sass/tale/_base.scss new file mode 100644 index 0000000..a513579 --- /dev/null +++ b/_sass/tale/_base.scss @@ -0,0 +1,66 @@ +* { + @include box-sizing; + line-height: 1.5; +} + +html, +body { + color: $default-color; + margin: 0; + padding: 0; +} + +html { + font-family: $serif-primary; + font-size: 14px; + overflow-y: scroll; + + @media (min-width: 600px) { + font-size: 16px; + } +} + +body { + -webkit-text-size-adjust: 100%; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: $default-shade; + font-family: $sans-serif; + line-height: normal; +} + +a { + color: $blue; + text-decoration: none; +} + +blockquote { + border-left: .25rem solid $grey-2; + color: $grey-1; + margin: .8rem 0; + padding: .5rem 1rem; + + p:last-child { + margin-bottom: 0; + } + + @media (min-width: 600px) { + padding: 0 5rem 0 1.25rem; + } +} + +img { + display: block; + margin: 0 0 1rem; + max-width: 100%; +} + +td { + vertical-align: top; +} diff --git a/_sass/tale/_catalogue.scss b/_sass/tale/_catalogue.scss new file mode 100644 index 0000000..242cdf5 --- /dev/null +++ b/_sass/tale/_catalogue.scss @@ -0,0 +1,45 @@ +.catalogue { + &-item { + border-bottom: 1px solid $grey-2; + color: $default-color; + display: block; + padding: 2rem 0; + + &:hover .catalogue-line, + &:focus .catalogue-line { + width: 5rem; + } + + &:last-child { + border: 0; + } + } + + &-pinned { + color: $default-tint; + font-family: $serif-secondary; + letter-spacing: .5px; + } + + &-time { + color: $default-tint; + font-family: $serif-secondary; + letter-spacing: .5px; + } + + &-title { + color: $default-shade; + display: block; + font-family: $sans-serif; + font-size: 2rem; + font-weight: 700; + margin: .5rem 0; + } + + &-line { + @include transition(all .3s ease-out); + border-top: .2rem solid $default-shade; + display: block; + width: 2rem; + } +} diff --git a/_sass/tale/_code.scss b/_sass/tale/_code.scss new file mode 100644 index 0000000..1597e13 --- /dev/null +++ b/_sass/tale/_code.scss @@ -0,0 +1,46 @@ +pre, +code { + font-family: $monospaced; +} + +code { + background-color: $grey-3; + border-radius: 3px; + color: $code-color; + font-size: 85%; + padding: .25em .5em; +} + +pre { + margin: 0 0 1rem; +} + +pre code { + background-color: transparent; + color: inherit; + font-size: 100%; + padding: 0; +} + +.highlight { + background-color: $grey-3; + border-radius: 3px; + line-height: 1.4; + margin: 0 0 1rem; + padding: 1rem; + + pre { + margin-bottom: 0; + overflow-x: auto; + } + + .lineno { + color: $default-tint; + display: inline-block; // Ensures the null space also isn't selectable + padding: 0 .75rem 0 .25rem; + // Make sure numbers aren't selectable + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + } +} diff --git a/_sass/tale/_layout.scss b/_sass/tale/_layout.scss new file mode 100644 index 0000000..ba4a7b0 --- /dev/null +++ b/_sass/tale/_layout.scss @@ -0,0 +1,92 @@ +.container { + margin: 0 auto; + max-width: 800px; + width: 80%; +} + +main, +footer, +.nav-container { + display: block; + margin: 0 auto; + max-width: 800px; + width: 80%; +} + +.nav { + box-shadow: 0 2px 2px -2px $shadow-color; + overflow: auto; + + &-container { + margin: 1rem auto; + position: relative; + text-align: center; + } + + &-title { + @include transition(all .2s ease-out); + color: $default-color; + display: inline-block; + margin: 0; + padding-right: .2rem; + + &:hover, + &:focus { + opacity: .6; + } + } + + ul { + list-style-type: none; + margin: 1rem 0 0; + padding: 0; + text-align: center; + } + + li { + @include transition(all .2s ease-out); + color: $default-color; + display: inline-block; + opacity: .6; + padding: 0 2rem 0 0; + + &:last-child { + padding-right: 0; + } + + &:hover, + &:focus { + opacity: 1; + } + } + + a { + color: $default-color; + font-family: $sans-serif; + } +} + +@media (min-width: 600px) { + .nav { + &-container { + text-align: left; + } + + ul { + bottom: 0; + position: absolute; + right: 0; + } + } +} + +footer { + font-family: $serif-secondary; + padding: 2rem 0; + text-align: center; + + span { + color: $default-color; + font-size: .8rem; + } +} diff --git a/_sass/tale/_pagination.scss b/_sass/tale/_pagination.scss new file mode 100644 index 0000000..3700e15 --- /dev/null +++ b/_sass/tale/_pagination.scss @@ -0,0 +1,44 @@ +.pagination { + border-top: .5px solid $grey-2; + font-family: $serif-secondary; + padding-top: 2rem; + position: relative; + text-align: center; + + span { + color: $default-shade; + font-size: 1.1rem; + } + + .top { + @include transition(all .3s ease-out); + color: $default-color; + font-family: $sans-serif; + font-size: 1.1rem; + opacity: .6; + + &:hover { + opacity: 1; + } + } + + .arrow { + @include transition(all .3s ease-out); + color: $default-color; + position: absolute; + + &:hover, + &:focus { + opacity: .6; + text-decoration: none; + } + } + + .left { + left: 0; + } + + .right { + right: 0; + } +} diff --git a/_sass/tale/_post.scss b/_sass/tale/_post.scss new file mode 100644 index 0000000..3680d80 --- /dev/null +++ b/_sass/tale/_post.scss @@ -0,0 +1,63 @@ +.post { + padding: 3rem 0; + + &-info { + color: $default-tint; + font-family: $serif-secondary; + letter-spacing: 0.5px; + text-align: center; + + span { + font-style: italic; + } + } + + &-title { + color: $default-shade; + font-family: $sans-serif; + font-size: 4rem; + margin: 1rem 0; + text-align: center; + } + + &-line { + border-top: 0.4rem solid $default-shade; + display: block; + margin: 0 auto 3rem; + width: 4rem; + } + + p { + margin: 0 0 1rem; + text-align: justify; + } + + a:hover { + text-decoration: underline; + } + + img { + margin: 0 auto 0.5rem; + } + + img + em { + color: $default-tint; + display: block; + font-family: $sans-serif; + font-size: 0.9rem; + font-style: normal; + text-align: center; + } + + // CSS for making emoji inline + img.emoji { + display: inline-block; + left: 0; + transform: none; + width: 1rem; + height: 1rem; + vertical-align: text-top; + padding: 0; + margin: 0; + } +} diff --git a/_sass/tale/_syntax.scss b/_sass/tale/_syntax.scss new file mode 100644 index 0000000..15ad797 --- /dev/null +++ b/_sass/tale/_syntax.scss @@ -0,0 +1,65 @@ +.highlight .hll { background-color: #ffc; } +.highlight .c { color: #999; } /* Comment */ +.highlight .err { color: #a00; background-color: #faa } /* Error */ +.highlight .k { color: #069; } /* Keyword */ +.highlight .o { color: #555 } /* Operator */ +.highlight .cm { color: #09f; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #099 } /* Comment.Preproc */ +.highlight .c1 { color: #999; } /* Comment.Single */ +.highlight .cs { color: #999; } /* Comment.Special */ +.highlight .gd { background-color: #fcc; border: 1px solid #c00 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #f00 } /* Generic.Error */ +.highlight .gh { color: #030; } /* Generic.Heading */ +.highlight .gi { background-color: #cfc; border: 1px solid #0c0 } /* Generic.Inserted */ +.highlight .go { color: #aaa } /* Generic.Output */ +.highlight .gp { color: #009; } /* Generic.Prompt */ +.highlight .gs { } /* Generic.Strong */ +.highlight .gu { color: #030; } /* Generic.Subheading */ +.highlight .gt { color: #9c6 } /* Generic.Traceback */ +.highlight .kc { color: #069; } /* Keyword.Constant */ +.highlight .kd { color: #069; } /* Keyword.Declaration */ +.highlight .kn { color: #069; } /* Keyword.Namespace */ +.highlight .kp { color: #069 } /* Keyword.Pseudo */ +.highlight .kr { color: #069; } /* Keyword.Reserved */ +.highlight .kt { color: #078; } /* Keyword.Type */ +.highlight .m { color: #f60 } /* Literal.Number */ +.highlight .s { color: #d44950 } /* Literal.String */ +.highlight .na { color: #4f9fcf } /* Name.Attribute */ +.highlight .nb { color: #366 } /* Name.Builtin */ +.highlight .nc { color: #0a8; } /* Name.Class */ +.highlight .no { color: #360 } /* Name.Constant */ +.highlight .nd { color: #99f } /* Name.Decorator */ +.highlight .ni { color: #999; } /* Name.Entity */ +.highlight .ne { color: #c00; } /* Name.Exception */ +.highlight .nf { color: #c0f } /* Name.Function */ +.highlight .nl { color: #99f } /* Name.Label */ +.highlight .nn { color: #0cf; } /* Name.Namespace */ +.highlight .nt { color: #2f6f9f; } /* Name.Tag */ +.highlight .nv { color: #033 } /* Name.Variable */ +.highlight .ow { color: #000; } /* Operator.Word */ +.highlight .w { color: #bbb } /* Text.Whitespace */ +.highlight .mf { color: #f60 } /* Literal.Number.Float */ +.highlight .mh { color: #f60 } /* Literal.Number.Hex */ +.highlight .mi { color: #f60 } /* Literal.Number.Integer */ +.highlight .mo { color: #f60 } /* Literal.Number.Oct */ +.highlight .sb { color: #c30 } /* Literal.String.Backtick */ +.highlight .sc { color: #c30 } /* Literal.String.Char */ +.highlight .sd { color: #c30; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #c30 } /* Literal.String.Double */ +.highlight .se { color: #c30; } /* Literal.String.Escape */ +.highlight .sh { color: #c30 } /* Literal.String.Heredoc */ +.highlight .si { color: #a00 } /* Literal.String.Interpol */ +.highlight .sx { color: #c30 } /* Literal.String.Other */ +.highlight .sr { color: #3aa } /* Literal.String.Regex */ +.highlight .s1 { color: #c30 } /* Literal.String.Single */ +.highlight .ss { color: #fc3 } /* Literal.String.Symbol */ +.highlight .bp { color: #366 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #033 } /* Name.Variable.Class */ +.highlight .vg { color: #033 } /* Name.Variable.Global */ +.highlight .vi { color: #033 } /* Name.Variable.Instance */ +.highlight .il { color: #f60 } /* Literal.Number.Integer.Long */ + +.css .o, +.css .o + .nt, +.css .nt + .nt { color: #999; } diff --git a/_sass/tale/_tags.scss b/_sass/tale/_tags.scss new file mode 100644 index 0000000..9e61cdf --- /dev/null +++ b/_sass/tale/_tags.scss @@ -0,0 +1,89 @@ +.tags { + &-header { + &-title { + color: $default-shade; + font-family: $sans-serif; + font-size: 4rem; + margin: 1rem 0; + text-align: center; + } + + &-line { + border-top: 0.4rem solid $default-shade; + display: block; + margin: 0 auto 3rem; + width: 4rem; + } + } + + &-clouds { + text-align: center; + font-family: $sans-serif; + + a { + display: inline-block; + margin: 0 0.1rem 0.2rem; + padding: 0.2rem 0.5rem; + background: rgba(0, 0, 0, 0.05); + border-radius: 5px; + color: $default-color; + text-decoration: none; + + &:hover, + &:active { + background: rgba(0, 0, 0, 0.1); + } + } + } + + &-item { + &-icon { + height: 1rem; + } + + &-label { + display: inline-block; + margin: 2rem 0 0.5rem; + font-family: $sans-serif; + color: $default-color; + } + } + + &-post { + display: flex; + justify-content: space-between; + padding: 5px 0; + + &-title { + color: $default-color; + text-decoration: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &-line { + @include transition(all 0.3s ease-out); + border-top: 0.1rem solid $default-shade; + display: block; + width: 0; + } + + &-meta { + color: $default-tint; + text-align: right; + white-space: nowrap; + } + + &:hover, + &:active { + .tags-post-line { + width: 3rem; + } + + .tags-post-meta { + color: $default-shade; + } + } + } +} diff --git a/_sass/tale/_variables.scss b/_sass/tale/_variables.scss new file mode 100644 index 0000000..55c4b93 --- /dev/null +++ b/_sass/tale/_variables.scss @@ -0,0 +1,29 @@ +// Colors +$default-color: #555 !default; +$default-shade: #353535 !default; +$default-tint: #aaa !default; +$grey-1: #979797 !default; +$grey-2: #e5e5e5 !default; +$grey-3: #f9f9f9 !default; +$white: #fff !default; +$blue: #4a9ae1 !default; +$shadow-color: rgba(0, 0, 0, .2) !default; +$code-color: #bf616a !default; + +// Fonts +$serif-primary: 'Libre Baskerville', 'Times New Roman', Times, serif !default; +$serif-secondary: Palatino, 'Palatino LT STD', 'Palatino Linotype', 'Book Antiqua', 'Georgia', serif !default; +$sans-serif: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif !default; +$monospaced: Menlo, Monaco, monospace !default; + +@mixin box-sizing($type: border-box) { + -webkit-box-sizing: $type; + -moz-box-sizing: $type; + box-sizing: $type; +} + +@mixin transition($args...) { + -webkit-transition: $args; + -moz-transition: $args; + transition: $args; +} diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png new file mode 100644 index 0000000..f4a8c65 Binary files /dev/null and b/assets/apple-touch-icon.png differ diff --git a/assets/favicon-16x16.png b/assets/favicon-16x16.png new file mode 100644 index 0000000..cfc9142 Binary files /dev/null and b/assets/favicon-16x16.png differ diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png new file mode 100644 index 0000000..21634dd Binary files /dev/null and b/assets/favicon-32x32.png differ diff --git a/assets/js/disqusLoader.js b/assets/js/disqusLoader.js new file mode 100644 index 0000000..56eae93 --- /dev/null +++ b/assets/js/disqusLoader.js @@ -0,0 +1,10 @@ +/* + disqusLoader.js v1.0 + A JavaScript plugin for lazy-loading Disqus comments widget. + - + By Osvaldas Valutis, www.osvaldas.info + Available for use under the MIT License +*/ +(function(b,f,l){var r=function(a){a=a.getBoundingClientRect();return{top:a.top+f.body.scrollTop,left:a.left+f.body.scrollLeft}},t=function(a,c){var d=f.createElement("script");d.src=a;d.async=!0;d.setAttribute("data-timestamp",+new Date);d.addEventListener("load",function(){"function"===typeof c&&c()});(f.head||f.body).appendChild(d)};l=function(a,c){var d,e;return function(){var g=this,f=arguments,b=+new Date;d&&bb.innerHeight*n||0 4.0" + spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" + spec.add_runtime_dependency "jekyll-feed", "~> 0.10" + spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.5" + + spec.add_development_dependency "bundler", "~> 2.0" + spec.add_development_dependency "rake", "~> 12.3.3" +end