branch: externals/org-remark
commit f6fe2ad221e077b2070f32ca3cf790e1a366f907
Author: Noboru Ota <m...@nobiot.com>
Commit: Noboru Ota <m...@nobiot.com>
docs: add missing user option to variable index
---
demo/demo.txt | 30 ++++++----
demo/marginalia.org | 156 +++++++++++++++++++++++-----------------------------
docs/org-remark.org | 1 +
3 files changed, 88 insertions(+), 99 deletions(-)
diff --git a/demo/demo.txt b/demo/demo.txt
index d43bd66cc0..0cc35dbcea 100644
--- a/demo/demo.txt
+++ b/demo/demo.txt
@@ -1,18 +1,17 @@
- *Org-remark*
+ Org-remark
- Highlight text;
- annotate for any text file.
+ Highlight and annotate any text file.
† Name chagned from
Org-marginalia
---
-
Art Nouveau
Source: https://en.wikipedia.org/wiki/Art_Nouveau
-Art Nouveau (/ˌɑːrt nuːˈvoʊ, ˌɑːr/; French: [aʁ nuvo]) is an international
style of art, architecture, and applied art, especially the decorative arts,
known in different languages by different names: Jugendstil in German, Stile
Liberty in Italian, Modernisme català in Catalan, etc. In English it is also
known as the Modern Style. The style was most popular between 1890 and 1910
during the Belle Époque period that ended with the start of World War I in
1914.[1] It was a reaction against [...]
+Art Nouveau (/ˌɑːrt nuːˈvoʊ, ˌɑːr/; French: [aʁ nuvo]) is an international
style of art, architecture, and
+applied art, especially the decorative arts, known in different languages by
different names: Jugendstil in German, Stile Liberty in Italian, Modernisme
català in Catalan, etc. In English it is also known as the Modern Style. The
style was most popular between 1890 and 1910 during the Belle Époque period
that ended with the start of World War I in 1914.[1] It was a reaction against
the academic art, eclecticism and historicism of 19th century architecture and
decoration. It was often ins [...]
One major objective of Art Nouveau was to break down the traditional
distinction between fine arts (especially painting and sculpture) and applied
arts. It was most widely used in interior design, graphic arts, furniture,
glass art, textiles, ceramics, jewellery and metal work.
@@ -29,18 +28,27 @@ The mouvement responded to Viollet le Duc’s theories on
rationalism which deri
- Use of modern technologie and materials [7].
---
-
Custom pens
+(find-file "custom-pens.el")
+
Example 1
-| (org-remark-create "magenda"
-| '(modus-themes-nuanced-magenta))
+ (org-remark-create "magenta"
+ '(modus-themes-nuanced-magenta))
Example 2
-| (org-remark-create "memorize"
-| '(:foreground "white" :underline "black")
-| '(CATEGORY "exam"))
+ (org-remark-create "memorize"
+ '(:foreground "white" :underline "black")
+ '(CATEGORY "exam"))
+
+---
+Org-remark
+
+GitHub Repository
+‣ https://github.com/nobiot/org-remark
+User manual
+‣ https://nobiot.github.io/org-remark
diff --git a/demo/marginalia.org b/demo/marginalia.org
index 05a25297bc..a26cc3c93b 100644
--- a/demo/marginalia.org
+++ b/demo/marginalia.org
@@ -1,50 +1,3 @@
-
-* demo
-:PROPERTIES:
-:marginalia-source-file: ~/local-repos/org-marginalia/demo/demo.txt
-:END:
-
-** marginalia
-:PROPERTIES:
-:marginalia-id: cba8da6a
-:marginalia-source-beg: 51
-:marginalia-source-end: 61
-:END:
-[[file:~/local-repos/org-marginalia/demo/demo.txt][demo]]
-
-*** Definition
-*Notes in the margin of a document*. [from 1830s]
-Source: https://en.wiktionary.org/wiki/marginalia
-
-Synonyms: apostil, marginal note, gloss
-
-We know what the composer was thinking as he wrote the piece because we can
read his handwritten marginalia on the manuscript.
-
-*** Pronunciation
-(General American) IPA(key): /mɑɹdʒɪˈneɪli.ə/
-(Received Pronunciation) IPA(key): /mɑːdʒɪˈneɪli.ə/
-Rhymes: -eɪliə
-Hyphenation: mar‧gi‧na‧lia
-
-*** Etymology
-From New Latin marginālia, from Medieval Latin neuter plural of marginālis
(“on the periphery”), from Latin margō (“border, edge”). Compare margin.
-[[file:Marginalia_from_Opticks_or,_A_treatise_of_the_reflexions,_refractions,_inflexions_and_colours_of_light.png]]
-Marginalia from Opticks or, A treatise of the reflexions, refractions,
inflexions and colours of light, is lincensed under CC BY 2.0. Obtained via
https://en.wiktionary.org/wiki/marginalia
-
-
-* marginalia
-:PROPERTIES:
-:marginalia-source-file: ~/local-repos/org-marginalia/demo/marginalia.org
-:END:
-
-** *Notes in the margin of a document
-:PROPERTIES:
-:marginalia-id: 929981c5
-:marginalia-source-beg: 283
-:marginalia-source-end: 317
-:END:
-[[file:~/local-repos/org-marginalia/demo/marginalia.org][marginalia]]
-
* demo
:PROPERTIES:
:org-remark-file: ~/src/org-remark/demo/demo.txt
@@ -52,11 +5,11 @@ Marginalia from Opticks or, A treatise of the reflexions,
refractions, inflexion
** Marginalia
:PROPERTIES:
-:org-remark-beg: 99
-:org-remark-end: 113
+:org-remark-beg: 89
+:org-remark-end: 103
:org-remark-id: 76539dd9
:org-remark-label: nil
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::32]]
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::7]]
:END:
*** Pronunciation
@@ -72,71 +25,98 @@ Marginalia from Opticks or, A treatise of the reflexions,
refractions, inflexion
** any text file
:PROPERTIES:
-:org-remark-beg: 54
-:org-remark-end: 67
+:org-remark-beg: 44
+:org-remark-end: 57
:org-remark-id: 6a4de876
:org-remark-label: yellow
:CATEGORY: important
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::32]]
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::4]]
:END:
** Highlight
:PROPERTIES:
-:org-remark-beg: 21
-:org-remark-end: 31
+:org-remark-beg: 20
+:org-remark-end: 30
:org-remark-id: 4d94d0fb
:org-remark-label: blue
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::32]]
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::4]]
+:END:
+
+
+** org-remark-create
+
+
+
+
+
+
+
+** Nouveau
+:PROPERTIES:
+:org-remark-beg: 176
+:org-remark-end: 183
+:org-remark-id: d6c51623
+:org-remark-label: nil
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::13]]
:END:
-** Belle Époque period
+Add annotation.
+** German, Stile Liberty in Italian
:PROPERTIES:
-:org-remark-beg: 576
-:org-remark-end: 595
-:org-remark-id: ec7d2487
+:org-remark-beg: 388
+:org-remark-end: 420
+:org-remark-id: f0be9d61
:org-remark-label: blue
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::32]]
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
-** 1890 and 1910
+** Other characteristics of Art Nouveau
:PROPERTIES:
-:org-remark-beg: 551
-:org-remark-end: 564
-:org-remark-id: 43249761
-:org-remark-label: memorize
+:org-remark-beg: 848
+:org-remark-end: 884
+:org-remark-id: a90a5866
+:org-remark-label: nil
:CATEGORY: exam
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::15]]
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
-** Catalan
+** 19th century
:PROPERTIES:
-:org-remark-beg: 453
-:org-remark-end: 460
-:org-remark-id: 934e0174
-:org-remark-label: memorize
-:CATEGORY: exam
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::15]]
+:org-remark-beg: 714
+:org-remark-end: 726
+:org-remark-id: c935365d
+:org-remark-label: red-line
+:CATEGORY: review
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
-** Modern Style
+Annotation for the 19th centry.
+
+** 1890 and 1910
:PROPERTIES:
-:org-remark-beg: 502
-:org-remark-end: 514
-:org-remark-id: 69bdf5cb
-:org-remark-label: magenda
-:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::15]]
+:org-remark-beg: 541
+:org-remark-end: 554
+:org-remark-id: 8ff2c5f8
+:org-remark-label: nil
+:CATEGORY: exam
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
-* custom-pens
+** World War I
:PROPERTIES:
-:org-remark-file: ~/src/org-remark/demo/custom-pens.el
+:org-remark-beg: 615
+:org-remark-end: 626
+:org-remark-id: 598a701e
+:org-remark-label: nil
+:CATEGORY: exam
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
-** org-remark-create
+** particularly iron
:PROPERTIES:
-:org-remark-beg: 133
-:org-remark-end: 150
-:org-remark-id: 8a255247
-:org-remark-label: magenda
-:org-remark-link: [[file:~/src/org-remark/demo/custom-pens.el::5]]
+:org-remark-beg: 1001
+:org-remark-end: 1018
+:org-remark-id: 895c6dfe
+:org-remark-label: nil
+:org-remark-link: [[file:~/src/org-remark/demo/demo.txt::14]]
:END:
diff --git a/docs/org-remark.org b/docs/org-remark.org
index 3042ee11df..844b307c47 100644
--- a/docs/org-remark.org
+++ b/docs/org-remark.org
@@ -258,6 +258,7 @@ this example: =C-n ] ] ] ] ]= (assuming this command is
bound to C-n ])
#+vindex: org-remark-highlighter
#+vindex: org-remark-create-default-pen-set
+#+vindex: org-remark-notes-file-path
#+vindex: org-remark-notes-display-buffer-action
#+vindex: org-remark-notes-buffer-name
#+vindex: org-remark-use-org-id
