Merge pull request #5 from creativeArtie/development

Development
creativeArtie · Nov 20, 2017 · abb1090 · abb1090
2 parents 096b975 + b63c6cd
commit abb1090
Show file tree

Hide file tree

Showing 123 changed files with 2,730 additions and 3,376 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+out/*
+jwriter.geany
diff --git a/README.md b/README.md
@@ -22,10 +22,10 @@ to one line.
 
 |Format   |Code          |
 |---------|--------------|
-|Italics  |`\*Text\*`    |
-|Bold     |`\*\*Text\*\*`|
-|Underline|`\_Text\_`    |
-|Code     |`\`Text\``    |
+|Italics  |`*Text*`      |
+|Bold     |`**Text**`    |
+|Underline|`_Text_`      |
+|Code     |`` `Text` ``  |
 
 There are also [footnote (syntax `{^footnote}`), endnote (syntax `{*endnote}`)](#note-styles),
 [links (syntax `<@reference id|link text>` or `<link path|link text>`)](#hyperlink),
@@ -84,10 +84,10 @@ page, while endnote appears at the end of either a section or a document.
 All footnote and endnotes will have an [id](#id) and text before they can appear
 in the printed document.
 
-|Types      |Line Syntax |In Text Syntax|
-|-----------|------------|--------------|
-|Footnote   | `!^id:text`| `{^id}`      |
-|Endnote    | `!*id:text`| `{*id}`      |
+|Types      |Line Syntax  |In Text Syntax|
+|-----------|-------------|--------------|
+|Footnote   | `!^id:text `| `{^id}`      |
+|Endnote    | `!*id:text `| `{*id}`      |
 
 Footnote will count by numbers, while endnot count by letters.
 

diff --git a/build.xml b/build.xml
@@ -34,6 +34,19 @@
     <property name="dir.src" location="${loc.src}" />
     <property name="dir.test" location="${loc.test}" />
 
+    <!-- ......................... Data Folder .......................... -->
+    <property name="dir.data"      location="${loc.data}" />
+    <property name="dir.data-run"  location="${dir.data}/run" />
+    <property name="dir.data-jar"  location="${dir.data}/jar" />
+    <property name="dir.data-test" location="${dir.data}/tests" />
+    <property name="dir.jar-root"  location="${dir.data}/jar-root" />
+
+    <!-- .......................... Libraries ........................... -->
+    <property name="dir.lib"  location="${loc.lib}" />
+    <property name="dir.junit" location="${dir.lib}/junit4" />
+    <property name="dir.3rd"  location="${dir.lib}/3rdparty" />
+    <property name="dir.off"  location="${dir.lib}/docs" />
+
     <!-- ........................ Output Folder ......................... -->
     <property name="dir.out" location="out/" />
     <!-- running java classes and data -->
@@ -46,28 +59,15 @@
     <property name="dir.jar"      location="${dir.out}/jar" />
     <property name="dir.jar-tmp"  location="${dir.out}/jar-bin" />
     <property name="dir.jar-res"  location="${dir.jar-tmp}/data" />
-    <property name="dir.jar-data" location="${dir.jar}/data" />
-    <property name="dir.jar-lib"  location="${dir.jar}/lib" />
+    <property name="dir.jar-data" location="${dir.data}/data" />
+    <property name="dir.jar-lib"  location="${dir.3rd}" />
     <property name="dir.jar-main" location="${dir.jar}/${ant.project.name}.jar" />
     <!-- Javadoc files -->
     <property name="dir.doc"  location="${dir.out}/doc/" />
     <!-- Junit report files -->
     <property name="dir.report" location="${dir.out}/report" />
     <property name="dir.report-raw"  location="${dir.out}/raw-report" />
 
-    <!-- ......................... Data Folder .......................... -->
-    <property name="dir.data"      location="${loc.data}" />
-    <property name="dir.data-run"  location="${dir.data}/run" />
-    <property name="dir.data-jar"  location="${dir.data}/jar" />
-    <property name="dir.data-test" location="${dir.data}/tests" />
-    <property name="dir.jar-root"  location="${dir.data}/jar-root" />
-
-    <!-- .......................... Libraries ........................... -->
-    <property name="dir.lib"  location="${loc.lib}" />
-    <property name="dir.junit" location="${dir.lib}/junit4" />
-    <property name="dir.3rd"  location="${dir.lib}/3rdparty" />
-    <property name="dir.off"  location="${dir.lib}/docs" />
-
     <!-- ............................ Others ............................ -->
     <property name="dir.design" location="${loc.design}" />
 
@@ -137,17 +137,13 @@
 
     <!-- ......................... Jar Targets .......................... -->
     <target name="compile.jar" depends="compile.run">
-        <!-- copy files -->
+        <!-- copy data files -->
         <copy toDir="${dir.jar-data}" overwrite="true">
             <fileset dir="${dir.data-run}" />
         </copy>
         <copy toDir="${dir.jar}" overwrite="true">
             <fileset dir="${dir.jar-root}" />
         </copy>
-        <!-- copy 3rd party libraries -->
-        <copy toDir="${dir.jar-lib}" overwrite="true">
-            <fileset dir="${dir.3rd}" />
-        </copy>
         <!-- set up temp folder -->
         <copy toDir="${dir.jar-tmp}" overwrite="true">
             <fileset dir="${dir.run}">
@@ -166,11 +162,12 @@
         </manifestclasspath>
         <!-- jar classes -->
         <jar destfile="${dir.jar-main}" baseDir="${dir.jar-tmp}">
+
+            <zipgroupfileset dir="${dir.jar-lib}" includes="*.jar"/>
             <!-- setup manifest file -->
             <manifest>
                 <attribute name="Program-Name" value="${ant.project.name}" />
                 <attribute name="Main-Class" value="${usr.main}" />
-                <attribute name="Class-Path" value="${lib.path}" />
             </manifest>
         </jar>
         <!-- set execute flag -->
@@ -253,17 +250,6 @@
             access="${usr-access}" classpathref="src-run.path" />
     </target -->
 
-    <!-- archive verisons -->
-    <target name="archive">
-        <mkdir dir="${dir.archive}" />
-        <zip destfile="${dir.store}">
-            <zipfileset dir="${dir.src}" prefix="${loc.src}" />
-            <zipfileset dir="${dir.data}" prefix="${loc.data}" />
-            <zipfileset dir="${dir.test}" prefix="${loc.test}" />
-            <zipfileset dir="${dir.lib}" prefix="${loc.lib}" />
-        </zip>
-    </target>
-
     <!-- clear generated things -->
     <target name="clean">
         <delete dir="${dir.out}" />

diff --git a/data/jar-root/windows.bat b/data/jar-root/windows.bat
@@ -0,0 +1 @@
+java -jar Example.jar
diff --git a/data/jar/base-styles.properties b/data/jar/base-styles.properties
@@ -34,3 +34,7 @@ Common.NoneFound=-fx-font-style:italic;
 ListView.Mulitple=-fx-fill:"orange"
 ListView.NoID=-fx-fill:"red";
 ListView.SpanTarget=-fx-font-style:italic;
+ListView.NoteHeading=-fx-fill:"midnightblue";-fx-font-size:18;
+CheatSheet.TurnOn=-fx-font-weight:bold;
+CheatSheet.TurnOff=-fx-font-weight:normal;
+CheatSheet.Base=-fx-label-padding:2,0,0,0
diff --git a/data/jar/windowText.properties b/data/jar/windowText.properties
@@ -7,16 +7,17 @@ TreeView.Outlines=Table of Outlines
 TreeView.NoLine=(No Headings)
 ListView.Types=Types of lists
 ListView.NoItems=No User Items found
-ListView.Comment=Unnamed Notes
 ListView.Footnote=Footnote
 ListView.Endnote=Endnote
 ListView.Link=Hyperlinks
-ListView.Note=Named Note
+ListView.Note=Research Note
 ListView.ColId=Idenifier
 ListView.ColCategory=Category
+ListView.NoCategory=(None)
 ListView.ColName=Name
 ListView.ColLocation=Location
 ListView.ColRef=Refer With
+ListView.NoRef=(n/a)
 ListView.ColSpan=Text
 ListView.NoSpan=(Not Found)
 ListView.NoteTitle=Note
@@ -25,44 +26,39 @@ ListView.SelectEmpty=No Note Found
 ListView.Source=Source
 ListView.InText=In text
 ListView.Footnote=Footnote
-TextView.Paragraph=Paragraph
-TextView.Quote=Quote
-TextView.Break=Break
-TextView.Numbered1=Numbered 1
-TextView.Numbered2=Numbered 2
-TextView.Numbered3=Numbered 3
-TextView.Numbered4=Numbered 4
-TextView.Numbered5=Numbered 5
-TextView.Numbered6=Numbered 6
-TextView.Bullet1=Bullet 1
-TextView.Bullet2=Bullet 2
-TextView.Bullet3=Bullet 3
-TextView.Bullet4=Bullet 4
-TextView.Bullet5=Bullet 5
-TextView.Bullet6=Bullet 6
-TextView.Heading1=Heading 1
-TextView.Heading2=Heading 2
-TextView.Heading3=Heading 3
-TextView.Heading4=Heading 4
-TextView.Heading5=Heading 5
-TextView.Heading6=Heading 6
-TextView.Outline1=Outline 1
-TextView.Outline2=Outline 2
-TextView.Outline3=Outline 3
-TextView.Outline4=Outline 4
-TextView.Outline5=Outline 5
-TextView.Outline6=Outline 6
-TextView.Hyperlink=Hyperlink
-TextView.Footnote=Footnote Text
-TextView.Endnote=Endnote Text
-TextView.Agenda=Agenda Line
-TextView.Source=Note Citation
-TextView.Note=Research Note
-TextView.Stub=Section Stub
-TextView.Draft=Draft Copy
-TextView.Final=Final Copy
-TextView.Other=Custom Status
-TextView.None=None
+CheatSheet.Paragraph=Paragraph
+CheatSheet.Quote=>Quote
+CheatSheet.Break=*** (Break)
+CheatSheet.Heading==@id:Heading#status
+CheatSheet.Outline=!#@id:Outline#status
+CheatSheet.Stub=#STUB
+CheatSheet.Draft=#DRAFT
+CheatSheet.Final=#FINAL
+CheatSheet.Other=# (Custom)
+CheatSheet.FieldSource=source
+CheatSheet.FieldInText=in-text
+CheatSheet.FieldFootnote=footnote
+CheatSheet.Id=category-name
+CheatSheet.Numbered=#Numbered
+CheatSheet.Bullet=-Bullet
+CheatSheet.Hyperlink=!@id:path
+CheatSheet.Footnote=!^id:foot note
+CheatSheet.Endnote=!*id:end note
+CheatSheet.Agenda=!! agenda
+CheatSheet.Source=!>id:source
+CheatSheet.Note=!%@id:note
+CheatSheet.FormatBold=**Bold**
+CheatSheet.FormatItalics=*Italics*
+CheatSheet.FormatCoded=`Code`
+CheatSheet.FormatUnderline=_Underline_
+CheatSheet.FormatAgenda={!!Agenda}
+CheatSheet.FormatEscape=\\* (escapes "*")
+CheatSheet.FormatLinkDir=<path:link text>
+CheatSheet.FormatLinkRef=<@id: link text>
+CheatSheet.FormatFootnote={^footnote id}
+CheatSheet.FormatEndnote={*endnote id}
+CheatSheet.FormatNote={@note id}
+CheatSheet.Agenda=!!agenda
 AgendaList.Name=Agenda List
 AgendaList.Empty=(Empty)
 HeadingView.NoFound=(n/a)

diff --git a/data/tests/help-text.txt b/data/tests/help-text.txt
@@ -0,0 +1,35 @@
+=@head-id:This is heading 1 with id and the id is in a category
+=List of formats
+The list of formats avaiable: `coded`, _underline_, *italics*, and **bold**
+Also has <@ref|link with reference> <www.google.com|direct link> {@citation}, {*endnote}, and {^footnote}
+=List of line styles avaiable
+Basic paragraph
+> quote block
+- bullet
+# Level 1 numbered
+    # Level 2 numbered
+        # Level 3 numbered (to level 6)
+
+    - Level 2 bullet without being nested
+Section break (below)
+***
+!*endnote: these are notes to end of a published section/document
+!^footnote: these are notes at the end of a published page.
+!@ref:https://github.com/creativeArtie/JWriter
+=More on heading
+==This is a subheading with a stub status #STUB detail of the status
+!# This is a outline with a draft status #DRAFT
+status can be `#STUB`, `#DRAFT`, `#FINAL`, `#` (None)
+All outline and heading can have id and status
+=Note and comments
+!!This is full line agenda
+This has a {!in line agenda}
+Agendas are to-do list and will create warning while trying to print or export
+!%@note: This is a note
+!% put them anywhere
+!%@citation:This is another note (separated because of the id) with citation
+!%`source` is what in the reference section
+!%`in-text` appears inside the text for APA or MLA styles
+!%`footnote` appears as a footnote like CMS style
+!>source:Author. *Book Title* Publish place: publish house, year. Print
+!>in-text:(Author, page)
diff --git a/design.tar.gz b/design.tar.gz