0.3.0

AdamSteffanick · Feb 26, 2019 · 13034ca · 13034ca
1 parent e8ba373
commit 13034ca
Show file tree

Hide file tree

Showing 7 changed files with 687 additions and 548 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,29 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [0.3.0] - 2019-02-26
+### Added
+* [html5.xquery]
+* `html5:element()` ([html5.xquery])
+* `m:home()` ([model.xquery])
+
+### Changed
+* `m:html5()` ([model.xquery]) → `html5:html()` ([html5.xquery])
+* `m:html5-base()` ([model.xquery]) → `html5:base()` ([html5.xquery])
+* `m:html5-body()` ([model.xquery]) → `html5:body()` ([html5.xquery])
+* `m:html5-filter()` ([model.xquery]) → `html5:html-filter()` ([html5.xquery])
+* `m:html5-head()` ([model.xquery]) → `html5:head()` ([html5.xquery])
+* `m:html5-head-meta()` ([model.xquery]) → `html5:meta-priority()` ([html5.xquery])
+* `m:html5-link()` ([model.xquery]) → `html5:link()` ([html5.xquery])
+* `m:html5-lang()` ([model.xquery]) → html5:lang()` ([html5.xquery])
+* `m:html5-meta()` ([model.xquery]) → `html5:meta()` ([html5.xquery])
+* `m:html5-noscript()` ([model.xquery]) → `html5:noscript()` ([html5.xquery])
+* `m:html5-refine()` ([model.xquery]) → `html5:html-refine` ([html5.xquery])
+* `m:html5-script()` ([model.xquery]) → `html5:script()` ([html5.xquery])
+* `m:html5-style()` ([model.xquery]) → `html5:style()` ([html5.xquery])
+* `m:html5-template()` ([model.xquery]) → `html5:template()` ([html5.xquery])
+* `m:html5-title()` ([model.xquery]) → `html5:title()` ([html5.xquery])
+
 ## [0.2.3] - 2019-02-18
 ### Added
 * `bootstrap:navbar-search()` @param `$parameter` ([bootstrap.xquery])
@@ -99,7 +122,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 * [LISENCE]
 * [README.md]
 
-[Unreleased]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.2.3...HEAD
+[Unreleased]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.2.3...v0.3.0
 [0.2.3]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.2.2...v0.2.3
 [0.2.2]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/AdamSteffanick/mvc-xquery/compare/v0.2.0...v0.2.1
@@ -114,11 +138,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 [LISENCE]: https://github.com/AdamSteffanick/mvc-xquery/blob/master/LICENSE
 [README.md]: ./README.md
 
-[/modules/]: ./modules/
+[controller.xquery]: ./controller.xquery
 [model.xquery]: ./model.xquery
 [view.xquery]: ./view.xquery
-[controller.xquery]: ./controller.xquery
+
+[/modules/]: ./modules/
 [bootstrap.xquery]: ./modules/bootstrap.xquery
+[html5.xquery]: ./modules/html5.xquery
 
 [Bootstrap]: https://getbootstrap.com/
 [shields.io]: http://shields.io/
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 MVC-XQuery | A Model-View-Controller framework for BaseX 
 
-Copyright (C) 2018 [Adam Steffanick](https://www.steffanick.com/adam/)
+Copyright (C) 2018–2019 [Adam Steffanick](https://www.steffanick.com/adam/)
 
 ## Download
 * [**Latest release**](https://github.com/AdamSteffanick/mvc-xquery/releases/latest)
@@ -17,12 +17,11 @@ Copyright (C) 2018 [Adam Steffanick](https://www.steffanick.com/adam/)
 * Navigate to http://localhost:8984 in your browser
 
 ### Default output
-#### m:html5()
+#### `html5:html()`
 ```
-<!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
+    <meta charset="utf-8"/>
     <title>MVC-XQuery | A Model-View-Controller framework for BaseX</title>
   </head>
   <body>
@@ -31,14 +30,14 @@ Copyright (C) 2018 [Adam Steffanick](https://www.steffanick.com/adam/)
 </html>
 ```
 
-#### m:html5($bootstrap:template)
+#### `html5:html($bootstrap:template)`
 ```
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
     <title>MVC-XQuery | A Model-View-Controller framework for BaseX</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
   </head>
   <body>
     <h1>Hello, world!</h1>
@@ -51,6 +50,7 @@ Copyright (C) 2018 [Adam Steffanick](https://www.steffanick.com/adam/)
 
 ## Features
 * [Bootstrap] v4.2.1 support
+* [HTML5] v5.2 support
 
 ## Manifest tree
 MVC-XQuery should contain:
@@ -63,10 +63,11 @@ mvc-xquery
 ├── controller.xquery
 ├── model.xquery
 ├── modules
-│   └── bootstrap.xquery
+│   ├── bootstrap.xquery
+│   └── html5.xquery
 └── view.xquery
 
-1 directory, 7 files
+1 directory, 8 files
 ```
 
 ## License
@@ -77,12 +78,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 [CHANGELOG]: ./CHANGELOG.md
-[version-badge]: https://img.shields.io/badge/mvc--xquery-v0.2.3-0038e2.svg?style=flat-square
+[version-badge]: https://img.shields.io/badge/mvc--xquery-v0.3.0-0038e2.svg?style=flat-square
 [LICENSE]: ./LICENSE
 [license-badge]: https://img.shields.io/badge/license-GPL-0038e2.svg?style=flat-square
 
 [model.xquery]: ./model.xquery
 [view.xquery]: ./view.xquery
 [controller.xquery]: ./controller.xquery
 
-[Bootstrap]: https://getbootstrap.com/
+[Bootstrap]: https://getbootstrap.com/
+[HTML5]: https://www.w3.org/TR/html52/
diff --git a/controller.xquery b/controller.xquery
@@ -4,13 +4,13 @@ xquery version "3.1" encoding "UTF-8";
  : The MVC-XQuery controller function library module.
  :
  : MVC-XQuery | A Model-View-Controller framework for BaseX
- : Copyright (C) 2018 Adam Steffanick
+ : Copyright (C) 2018–2019 Adam Steffanick
  :
  : @author Adam Steffanick
  : @see https://www.steffanick.com/adam/
- : @version v0.2.3
+ : @version v0.3.0
  : @see https://github.com/AdamSteffanick/mvc-xquery
- : February 18, 2019
+ : February 26, 2019
  : @since v0.0.2
  :
  : This program is free software: you can redistribute it and/or modify
@@ -35,15 +35,12 @@ module namespace c = "controller";
 import module namespace m = "model" at "model.xquery";
 import module namespace v = "view" at "view.xquery";
 
-(: optional, included function library modules :)
-import module namespace bootstrap = "bootstrap" at "modules/bootstrap.xquery";
-
 (:~
  : A function to return an HTML5 home page to the user.
  :
  : @author Adam Steffanick
  : @see https://www.steffanick.com/adam/
- : @version v1.0.1
+ : @version v2.0.0
  : @since v0.1.0
  :
  : @return an HTML5 home page
@@ -57,6 +54,6 @@ declare
 %private function c:home(
 )
 {
-  m:html5()
+  m:home()
   => v:html()
 };