Re: [org-cite] Testing on macOS, XML file missing

2021-10-03 Thread Rudolf Adamkovič

Kyle Meyer  writes:

This is hopefully resolved with bb209cd5ab (Update to Org 
9.5-30-g10dc9d, 2021-10-02) in the Emacs repo.


It works now. Thank you! 


R+

--
Logic is a science of the necessary laws of thought, without which 
no employment of the understanding and the reason takes place. -- 
Immanuel Kant, 1785  Rudolf Adamkovič  
Studenohorská 25 84103 Bratislava Slovakia  [he/him]




Re: [org-cite] Testing on macOS, XML file missing

2021-10-02 Thread Kyle Meyer
Kyle Meyer writes:

> Rudolf Adamkovič writes:
>
>> When I try to export HTML with APA/CSL citations (C-c C-e h o), 
>> Emacs says:
>>
>>> The default CSL locale file 
>>> /Users/salutis/src/emacs/nextstep/Emacs.app/Contents/Resources/lisp/org/etc/csl/locales-en-US.xml
>>>  
>>> doesn’t exist or is unreadable

This is hopefully resolved with bb209cd5ab (Update to Org
9.5-30-g10dc9d, 2021-10-02) in the Emacs repo.



Re: [org-cite] Testing on macOS, XML file missing

2021-10-02 Thread Kyle Meyer
Bruce D'Arcus writes:

> Sorry; I wasn't clear.
>
> What I meant is that etc/styles was also not synced.

Right, some of the non-lisp files get moved around directory-wise
between the Org and Emacs repos.  Just in case it didn't stick out in
the snippets from my message upstream, the same files are there on both
sides:

  $ git -C org-mode ls-tree -r release_9.5:etc/styles
  100644 blob d0c98a3e51c079e74780d54289b09ba8ba52ac64  
OrgOdtContentTemplate.xml
  100644 blob 1a8edee99b4ccbbb18321091a7530afee660906a  OrgOdtStyles.xml
  100644 blob 07126fc31ba60103032e075e7cfdf81569e324c9  README

  $ git -C emacs show --no-patch --format="%s (%ch)" bf9ec3d91a
  Update to Org 9.5 (Wed Sep 29 23:21)

  $ git -C emacs ls-tree bf9ec3d91a:etc/org
  100644 blob d0c98a3e51c079e74780d54289b09ba8ba52ac64  
OrgOdtContentTemplate.xml
  100644 blob 1a8edee99b4ccbbb18321091a7530afee660906a  OrgOdtStyles.xml
  100644 blob 07126fc31ba60103032e075e7cfdf81569e324c9  README



Re: [org-cite] Testing on macOS, XML file missing

2021-10-02 Thread Kyle Meyer
Bruce D'Arcus writes:

> On Sat, Oct 2, 2021 at 1:24 AM Kyle Meyer  wrote:
>
>> Is there a reason to avoid updating to the latest version?
>
> No; updating them makes sense.

All right, thanks.  I've updated these files to latest versions in
06ab36eb0.



Re: [org-cite] Testing on macOS, XML file missing

2021-10-02 Thread Bruce D'Arcus
On Sat, Oct 2, 2021 at 1:46 AM Kyle Meyer  wrote:
>
> [reordering top-posting...]
>
> Bruce D'Arcus writes:
>
> > On Fri, Oct 1, 2021 at 8:33 AM Bruce D'Arcus  wrote:
> >>
> >> It looks like that /etc/csl directory isn't included in the emacs source 
> >> tree.
>
> > Actually, that whole etc directory is outdated.
>
> Aside from the new etc/csl/ directory that wasn't synced, could you be
> more specific about what you think is out of date between the Org repo
> and Emacs repo?

Sorry; I wasn't clear.

What I meant is that etc/styles was also not synced.

Bruce



Re: [org-cite] Testing on macOS, XML file missing

2021-10-02 Thread Bruce D'Arcus
On Sat, Oct 2, 2021 at 1:24 AM Kyle Meyer  wrote:

> Is there a reason to avoid updating to the latest version?

No; updating them makes sense.

Bruce



Re: [org-cite] Testing on macOS, XML file missing

2021-10-01 Thread Kyle Meyer
Rudolf Adamkovič writes:

> I compiled Emacs from "master" (2e92f90a5d) to try the new 
> citations.
>
[...]
>
> When I try to export HTML with APA/CSL citations (C-c C-e h o), 
> Emacs says:
>
>> The default CSL locale file 
>> /Users/salutis/src/emacs/nextstep/Emacs.app/Contents/Resources/lisp/org/etc/csl/locales-en-US.xml
>>  
>> doesn’t exist or is unreadable
>
> (I checked, and no 'etc' directory exists in 'lisp/org'.)

Thanks for the report.  Indeed I didn't check for new files outside of
lisp/, and etc/csl/ wasn't synced to Emacs.  Though even if those files
were present, you would have seen the same failure due to the way things
are written on our end.

I've pushed a set of commits to the Org repo (60b178e59, 0f11a44e0, and
9cc7f8bd1) that should prepare things on our end.  And I've done a local
sync to Emacs and verified that org-cite-csl--etc-dir looks to point to
the right place when running from Emacs and when installed to the
system.

Before we sync these etc/csl/ files to the Emacs repo (which hopefully
won't be a point of contention), I have a question about these files.
After a bit of digging, I traced their origin.  As I say in 9cc7f8bd1
(etc/csl: Add a README in preparation for Emacs sync):

  I did not add these files, but I have verified that
  
   - etc/csl/chicago-author-date.csl is identical to
 9821a884d2cbf919a064426999b05aa78e98da8d:chicago-author-date.csl
 from https://github.com/citation-style-language/styles
  
   - etc/csl/locales-en-US.xml is identical to
 a2b76b20ee120979ec66cfdcfa798b36fc5a7f0b:locales-en-US.xml from
 https://github.com/citation-style-language/locales

However, both of those files have newer versions.

  $ git log --oneline --format="%ch | %h %s" 9821a88.. -- 
chicago-author-date.csl
  Sun Sep 19 03:19 | ccb71844f Update chicago-author-date.csl (#5605)
  Apr 26 2020 | a78997329 Chicago: Uppercase "Presentated at" if no `genre` 
(#4729)
  Aug 13 2019 | d9852a293 Update chicago-author-date.csl and other author date 
variants (#4250)
  Jan 3 2019 | 246ce5fdf Chicago: Correct dictionary/encyclopedia entries
  May 21 2018 | 9296c8c15 Fix redundant terms (#3517)
  May 13 2018 | e4db3699d update chicago-author-date.csl; close issue #3386 
(#3455)
  Jan 25 2018 | f601d1af5 Fix missing space before locators. (#3288)
  Dec 6 2017 | 04cbd1787 Reindent/reorder

  ---

  $ git log --oneline --format="%ch | %h %s" a2b76b2.. -- locales-en-US.xml 
  Dec 29 2017 | 9a4eb48 Replace some usernames by real names
  Dec 29 2017 | f01d92a Drop email addresses from translator tags
  Dec 29 2017 | f6fa898 Add translators from git log to the locale files.

Is there a reason to avoid updating to the latest version?



Re: [org-cite] Testing on macOS, XML file missing

2021-10-01 Thread Bruce D'Arcus
Actually, that whole etc directory is outdated.

On Fri, Oct 1, 2021 at 8:33 AM Bruce D'Arcus  wrote:
>
> It looks like that /etc/csl directory isn't included in the emacs source tree.
>
> On Fri, Oct 1, 2021 at 4:57 AM Rudolf Adamkovič  wrote:
> >
> > Hi there,
> >
> > I compiled Emacs from "master" (2e92f90a5d) to try the new
> > citations.
> >
> > > ./configure --with-json
> > > make
> > > make install
> >
> > (per usual, no errors)
> >
> > When I try to export HTML with APA/CSL citations (C-c C-e h o),
> > Emacs says:
> >
> > > The default CSL locale file
> > > /Users/salutis/src/emacs/nextstep/Emacs.app/Contents/Resources/lisp/org/etc/csl/locales-en-US.xml
> > > doesn’t exist or is unreadable
> >
> > (I checked, and no 'etc' directory exists in 'lisp/org'.)
> >
> > Expected: HTML with APA citations
> >
> > Emacs configuration:
> >
> > > (setq-default org-cite-global-bibliography (my/bibtex-files) ;;
> > > (tons of .bib files)
> > >   org-cite-csl-styles-dir "~/")
> > >
> > > (require 'oc-csl)
> >
> > Org document:
> >
> > > #+title: Testing citations #+cite_export: csl apa.csl
> > > [cite:@manning-2009]
> >
> > Notes:
> >
> > - I also installed the 'citeproc' package, per "July 2021
> >   Introducing citations!".
> > - When I remove "#+cite_export: csl apa.csl", exporting works but
> >   results in no CSL/APA.
> >
> > R+
> >
> > --
> > "Contrariwise," continued Tweedledee, "if it was so, it might be;
> > and if it were so, it would be; but as it isn't, it ain't. That's
> > logic." -- Lewis Carroll, Through the Looking Glass  Rudolf
> > Adamkovič  Studenohorská 25 84103 Bratislava
> > Slovakia  [he/him]
> >



Re: [org-cite] Testing on macOS, XML file missing

2021-10-01 Thread Bruce D'Arcus
It looks like that /etc/csl directory isn't included in the emacs source tree.

On Fri, Oct 1, 2021 at 4:57 AM Rudolf Adamkovič  wrote:
>
> Hi there,
>
> I compiled Emacs from "master" (2e92f90a5d) to try the new
> citations.
>
> > ./configure --with-json
> > make
> > make install
>
> (per usual, no errors)
>
> When I try to export HTML with APA/CSL citations (C-c C-e h o),
> Emacs says:
>
> > The default CSL locale file
> > /Users/salutis/src/emacs/nextstep/Emacs.app/Contents/Resources/lisp/org/etc/csl/locales-en-US.xml
> > doesn’t exist or is unreadable
>
> (I checked, and no 'etc' directory exists in 'lisp/org'.)
>
> Expected: HTML with APA citations
>
> Emacs configuration:
>
> > (setq-default org-cite-global-bibliography (my/bibtex-files) ;;
> > (tons of .bib files)
> >   org-cite-csl-styles-dir "~/")
> >
> > (require 'oc-csl)
>
> Org document:
>
> > #+title: Testing citations #+cite_export: csl apa.csl
> > [cite:@manning-2009]
>
> Notes:
>
> - I also installed the 'citeproc' package, per "July 2021
>   Introducing citations!".
> - When I remove "#+cite_export: csl apa.csl", exporting works but
>   results in no CSL/APA.
>
> R+
>
> --
> "Contrariwise," continued Tweedledee, "if it was so, it might be;
> and if it were so, it would be; but as it isn't, it ain't. That's
> logic." -- Lewis Carroll, Through the Looking Glass  Rudolf
> Adamkovič  Studenohorská 25 84103 Bratislava
> Slovakia  [he/him]
>



[org-cite] Testing on macOS, XML file missing

2021-10-01 Thread Rudolf Adamkovič

Hi there,

I compiled Emacs from "master" (2e92f90a5d) to try the new 
citations.



./configure --with-json
make
make install


(per usual, no errors)

When I try to export HTML with APA/CSL citations (C-c C-e h o), 
Emacs says:


The default CSL locale file 
/Users/salutis/src/emacs/nextstep/Emacs.app/Contents/Resources/lisp/org/etc/csl/locales-en-US.xml 
doesn’t exist or is unreadable


(I checked, and no 'etc' directory exists in 'lisp/org'.)

Expected: HTML with APA citations

Emacs configuration:

(setq-default org-cite-global-bibliography (my/bibtex-files) ;; 
(tons of .bib files) 
  org-cite-csl-styles-dir "~/")


(require 'oc-csl) 


Org document:

#+title: Testing citations #+cite_export: csl apa.csl 
[cite:@manning-2009] 


Notes:

- I also installed the 'citeproc' package, per "July 2021 
 Introducing citations!".
- When I remove "#+cite_export: csl apa.csl", exporting works but 
 results in no CSL/APA.


R+

--
"Contrariwise," continued Tweedledee, "if it was so, it might be; 
and if it were so, it would be; but as it isn't, it ain't. That's 
logic." -- Lewis Carroll, Through the Looking Glass  Rudolf 
Adamkovič  Studenohorská 25 84103 Bratislava 
Slovakia  [he/him]