diff --git a/Core/MiPage.dyalog b/Core/MiPage.dyalog index 7dbcc973..2444cb1f 100644 --- a/Core/MiPage.dyalog +++ b/Core/MiPage.dyalog @@ -50,7 +50,7 @@ :Access public Head.Insert #._html.meta''('charset=',⍕Charset) :If ''≢OnLoad - Use'JQuery' + {0:: ⋄ Use'JQuery'}'' :EndIf b←RenderBody styles←∪_Styles @@ -68,6 +68,9 @@ :If ''≢OnLoad b,←(⎕NEW #._html.script('$(function(){',OnLoad,'});')).Render :EndIf + :If 0∊⍴⊃Attrs[⊂'lang'] ⍝ set the language for the page if not already set + {0:: ⋄ {Set'lang="',⍵,'" xml:lang="',⍵,'" xmlns="http://www.w3.org/1999/xhtml"'}_Request.Server.Config.Lang}'' + :EndIf r←RenderPage b :If 0≠⎕NC⊂'_Request.Response' _Request.Response.HTML←r diff --git a/Documentation Sources/Configuring MiServer.docx b/Documentation Sources/Configuring MiServer.docx new file mode 100644 index 00000000..59e24add Binary files /dev/null and b/Documentation Sources/Configuring MiServer.docx differ diff --git a/Documentation Sources/Configuring MiServer.pdf b/Documentation Sources/Configuring MiServer.pdf new file mode 100644 index 00000000..b2281570 Binary files /dev/null and b/Documentation Sources/Configuring MiServer.pdf differ diff --git a/Documentation Sources/Installation.docx b/Documentation Sources/Installation.docx deleted file mode 100644 index 39ed51e9..00000000 Binary files a/Documentation Sources/Installation.docx and /dev/null differ diff --git a/Documentation Sources/Installing MiServer.docx b/Documentation Sources/Installing MiServer.docx new file mode 100644 index 00000000..2439dde6 Binary files /dev/null and b/Documentation Sources/Installing MiServer.docx differ diff --git a/Documentation Sources/Installing MiServer.pdf b/Documentation Sources/Installing MiServer.pdf new file mode 100644 index 00000000..a46c3160 Binary files /dev/null and b/Documentation Sources/Installing MiServer.pdf differ diff --git a/SampleMiSites/MS3/Code/Templates/MiPageSample.dyalog b/SampleMiSites/MS3/Code/Templates/MiPageSample.dyalog index 6fa7768b..85356fbb 100644 --- a/SampleMiSites/MS3/Code/Templates/MiPageSample.dyalog +++ b/SampleMiSites/MS3/Code/Templates/MiPageSample.dyalog @@ -62,9 +62,6 @@ ⍝ }); ⍝ }); - ⍝ set the language for the page - lang←server.Config.Lang ⍝ use the language specified in Server.xml - Set'lang="',lang,'" xml:lang="',lang,'" xmlns="http://www.w3.org/1999/xhtml"' :Else Head.Add _.StyleSheet'/Styles/sampleStyles.css' Body.class←'bodyblock' diff --git a/SampleMiSites/MS3/Documentation/Install and Config/Configuration.pdf b/SampleMiSites/MS3/Documentation/Install and Config/Configuration.pdf deleted file mode 100644 index d24793e2..00000000 Binary files a/SampleMiSites/MS3/Documentation/Install and Config/Configuration.pdf and /dev/null differ diff --git a/SampleMiSites/MS3/Documentation/Install and Config/Configuring MiServer.pdf b/SampleMiSites/MS3/Documentation/Install and Config/Configuring MiServer.pdf new file mode 100644 index 00000000..b2281570 Binary files /dev/null and b/SampleMiSites/MS3/Documentation/Install and Config/Configuring MiServer.pdf differ diff --git a/SampleMiSites/MS3/Documentation/Install and Config/Installation.pdf b/SampleMiSites/MS3/Documentation/Install and Config/Installation.pdf deleted file mode 100644 index 288659f6..00000000 Binary files a/SampleMiSites/MS3/Documentation/Install and Config/Installation.pdf and /dev/null differ diff --git a/SampleMiSites/MS3/Documentation/Install and Config/Installing MiServer.pdf b/SampleMiSites/MS3/Documentation/Install and Config/Installing MiServer.pdf new file mode 100644 index 00000000..a46c3160 Binary files /dev/null and b/SampleMiSites/MS3/Documentation/Install and Config/Installing MiServer.pdf differ diff --git a/SampleMiSites/MS3/Examples/DC/MarkdownSimple.mipage b/SampleMiSites/MS3/Examples/DC/MarkdownSimple.mipage index ca3ef672..1e1722d5 100644 --- a/SampleMiSites/MS3/Examples/DC/MarkdownSimple.mipage +++ b/SampleMiSites/MS3/Examples/DC/MarkdownSimple.mipage @@ -2,12 +2,12 @@ ⍝ Control:: _DC.Markdown ⍝ Description:: Use markdown to generate HTML - ∇ Compose + ∇ Compose;markdown :Access public Add _.h3'The Markdown widget based on Kai Jaeger''s MarkAPL project' Add'The following code produces the output below...' Add CodeFollows - Add _.Markdown ScriptFollows + markdown←('{version}'(#.Strings.deb⍕,'MiServer uses' 'version' 'built on',⍪#.MarkAPL.Version))Subst ScriptFollows ⍝#### The Markdown widget processes "markdown" ⍝Markdown is a simple way to add formatting like headers, **bold text**, _italicized text_,\ ⍝* bulleted @@ -16,8 +16,10 @@ ⍝ ⍝ and so on, to plain text without having to use HTML markup.\ ⍝ - ⍝ [Click here for more information on The MarkAPL Project](http://aplwiki.com/MarkAPL). - + ⍝ Click [here](http://aplwiki.com/MarkAPL) for more information on The MarkAPL Project.\ + ⍝ Click [here](/Examples/Data/MarkAPL.html) to view the MarkAPL documentation.\ + ⍝ MiServer uses {version}. + Add _.Markdown markdown ⍝<> ∇ diff --git a/SampleMiSites/MS3/Examples/Data/MarkAPL.html b/SampleMiSites/MS3/Examples/Data/MarkAPL.html index 53b8957f..7d48a571 100644 --- a/SampleMiSites/MS3/Examples/Data/MarkAPL.html +++ b/SampleMiSites/MS3/Examples/Data/MarkAPL.html @@ -1873,6 +1873,9 @@
3.1.8.2. The “pound” syntax (ATX)

is converted into a header of level 1 while a line that looks like this:

###### My caption

is converted into a header of level 6. You cannot have headers of level 7 or higher (HTML does not allow this), and it is probably not a good idea to use levels beyond 4 anyway, except perhaps in technical documentation.

+

Many Markdown implementations do not require a space between the last # on the left and the content (= the header as such). However, the space was required even by the original Markdown specification. The CommonMark specification points out that this was actually a good idea because with the blank these two lines would be rendered as headers:

+
#5 bolt
+
#hashtag

Note that you may have trailing # characters as well; however, they are simply ignored. That's the reason why the number of characters does not even have to match the leading number of #.

3.1.8.3. ATX versus SeText syntax
@@ -2578,6 +2581,22 @@
3.1.16.4. In-line mark-up in cells

Note that one cell contains a pipe symbol (|); normally that would confuse the parser but not in this case because it is escaped with a backslash character: \|.

+

You can have a table with just column headers:

+
|First name |Last Name|
+|-|-A
+

This is the result:

+ + + + + + + + + + + +
First nameLast Name
--A

3.2. Misc

 @@ -2850,6 +2869,7 @@
3.4.2.4. checkLinks
3.4.2.5. compileFunctions

Boolean that defaults to 1. There is just one reason to prevent any function from being compiled: performance measurements.

+

However, with version 1.8.3 MarkAPL does not compile its functions anymore because this caused trouble under some circumstances while the performance gains are little.

3.4.2.6. createFullHtmlPage
 @@ -3106,7 +3126,7 @@

5.3. Unexpected results

Before reporting a bug please check carefully your Markdown, in particular when the problem appears in or after complex table or list definitions. More often than not mistakes in the Markdown are causing the problem.

If you cannot work out why it goes wrong report it to me – see the previous topic for how to report a problem.

-

This document refers to version 1.8.2 of MarkAPL. Kai Jaeger ⋄ APL Team Ltd ⋄ 2016-07-03

+

This document refers to version 1.8.4 of MarkAPL. Kai Jaeger ⋄ APL Team Ltd ⋄ 2016-07-24

Footnotes

diff --git a/SampleMiSites/MS3/Styles/sampleStyles.css b/SampleMiSites/MS3/Styles/sampleStyles.css index d8825db5..4b2d3c33 100644 --- a/SampleMiSites/MS3/Styles/sampleStyles.css +++ b/SampleMiSites/MS3/Styles/sampleStyles.css @@ -293,7 +293,7 @@ a:visited { text-decoration: none; } -pre { +#codeblock > pre { font-size: medium; overflow-x: auto; max-width: 100%;