Re: [LyX/master] oops, git is playing games with me.

[Pavel Sanda]

Christian Ridderström wrote:
> There's an FTP on the LyX server... I sent out details earlier today.
> So perhaps 'sshfs' is an option for uploading things.

Maybe we could have separate account just for manuals and possibility to
directly link to that folder from web/wiki. That way Tommaso can directly
upload his exports to web without relying on me. That would be good.

> - From where are the files uploaded? A developer's computer? A CI job?

>From local machine where someone runs the committed script for building 
>manuals.

> - Are uploads to be triggered automatically?

Unlikely.

> - How often would we do new uploads? Once per release, a few times per 
> release?

At most once per release, maybe even once per major relase.

> - To where should the files be uploaded?

Internally does not matter, we just need bash-like access for rm/cp -r  commands
(ftp through curl-ftps is just fine for that) and ability to directly link
it through URL.

> As I wrote in some other post I also thinks it's good to have a separate
> staging area for review, and a separate deployment area to which users
> are referred.

I do not see that we have enough manpower to manage such complications. At this
moment, even after one decade, we were not able to publish in html form 
*anything*.
So keep it as simple as possible...

Pavel

Re: [LyX/master] oops, git is playing games with me.

[Christian Ridderström]

Pavel Sanda  writes:

> The way I can comfortably push this tree onto web server will make
> it pages of it's own so pmwiki format is of no help.
>
> If you want to make part of wiki the only reasonable way I see is
> to cooperate with Christian to create some sort of ftp/scp uploading
> tunnel. I have no problem with such solution, but it's in your hands
> then :)

There's an FTP on the LyX server... I sent out details earlier today.
So perhaps 'sshfs' is an option for uploading things.

I'm not really sure what you're trying to achieve, e.g.

- From where are the files uploaded? A developer's computer? A CI job?
- Are uploads to be triggered automatically?
- How often would we do new uploads? Once per release, a few times per release?
- To where should the files be uploaded?

As I wrote in some other post I also thinks it's good to have a separate
staging area for review, and a separate deployment area to which users
are referred.
/Christian

PS.
A long time ago I wrote some PmWiki markup that lists files in a folder.
It might be possible to use this markup to automatically generate lists/tables.

Re: [LyX/master] oops, git is playing games with me.

[Tommaso Cucinotta]

On 18/08/2017 02:09, Tommaso Cucinotta wrote:

no more time for today... but perhaps the cache wipe-out work-around is already 
good enough.


pushed, seems acceptable (except for 0_tmp_tmp_*, 1_tmp_tmp_*, etc...)

T.

Re: [LyX/master] oops, git is playing games with me.

[Tommaso Cucinotta]

On 17/08/2017 21:49, Pavel Sanda wrote:

To recap the current problems from my POV:
1. en/ should have it's own directory as a normal language
because xhtml output target produces lot of images which clutter
root dir (please use xhtml, not html).


sure, easy.


2. exported icons still contain original path in the filename.
ideally we want fixed filenames for images so when you regenerate
documentation only real changes need to be committed.


tracked down somewhat, 2 problems:
1) conversion cache: if the image (footnote.png) is found in the cache, then 
its associated absolute path is pulled in;
   workaround: wipe out ~/.lyx-trunk/cache, or equivalently run with a custom 
temporary userdir when converting manuals

still, the image is converted with the full pathname of the temporary folder where 
the conversion is being done (no conversion in this case, as it's a .png -> 
.png, but still a lot of code is executed, the file is copied, etc.), being smth. 
like /tmp/tmp.X/orig_filename.png, resulting in an exported image filename 
like: 0_tmp_tmp_X_orig_filename.png which seems still sub-optimal; this comes 
from:

2) when loading a graphics inset, LyX stores into the inset params().filename 
the absolute file path of the references image file, not the relative path; 
this can be avoided with [1], but it's not sufficient, because still LyX 
references the 0_tmp_tmp_* filename instead.

no more time for today... but perhaps the cache wipe-out work-around is already 
good enough.

T.

[1]

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 3cc550b5..2aa1b8ff 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -299,7 +299,7 @@ void InsetGraphics::read(Lexer & lex)
 {
lex.setContext("InsetGraphics::read");
//lex >> "Graphics";
-   readInsetGraphics(lex, buffer(), true, params_);
+   readInsetGraphics(lex, buffer(), false, params_);
graphic_->update(params().as_grfxParams());
 }
 
@@ -568,7 +568,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const

if (params().filename.empty())
return string();
 
-   string const orig_file = params().filename.absFileName();

+   string const orig_file = 
params().filename.relFileName(buffer().filePath());
// this is for dryrun and display purposes, do not use latexFilename
string const rel_file = 
params().filename.relFileName(buffer().filePath());
 
@@ -902,7 +902,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
 
string const to   = findTargetFormat(from, runparams);

string const ext  = theFormats().extension(to);
-   string const orig_file = params().filename.absFileName();
+   string const orig_file = 
params().filename.relFileName(buffer().filePath());
string output_file = onlyFileName(temp_file.absFileName());
LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to);
LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);

Re: [LyX/master] oops, git is playing games with me.

[Pavel Sanda]

Tommaso Cucinotta wrote:
> Thx Pavel for pushing this. I'd like to add to the script the capability to 
> generate the index in PmWiki format, so that its output can be 
> copy'n'pasted straight to

At this moment I do not consider the script at production stage
so feel free to develop it in any way you want.

To recap the current problems from my POV:
1. en/ should have it's own directory as a normal language
   because xhtml output target produces lot of images which clutter
   root dir (please use xhtml, not html).

2. exported icons still contain original path in the filename.
   ideally we want fixed filenames for images so when you regenerate
   documentation only real changes need to be committed.

3. some manuals have difficulties (i know that for sure with math manual
   others I did not try).

The way I can comfortably push this tree onto web server will make
it pages of it's own so pmwiki format is of no help.

If you want to make part of wiki the only reasonable way I see is
to cooperate with Christian to create some sort of ftp/scp uploading
tunnel. I have no problem with such solution, but it's in your hands
then :)

Pavel

Re: [LyX/master] oops, git is playing games with me.

[Tommaso Cucinotta]

Thx Pavel for pushing this. I'd like to add to the script the capability to 
generate the index in PmWiki format, so that its output can be copy'n'pasted 
straight to

  http://wiki.lyx.org/LyX/Manuals2

What'd'u think?

T.

On 17/08/2017 01:25, Pavel Sanda wrote:

commit e8b324a984e6cbbeb4ea02ba553bd5da520eb3f8
Author: Pavel Sanda 
Date:   Thu Aug 17 01:24:44 2017 +0200

 oops, git is playing games with me.
---
  development/tools/generate_manuals_for_web.sh |3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/development/tools/generate_manuals_for_web.sh 
b/development/tools/generate_manuals_for_web.sh
index 2ae337c..b28a638 100755
--- a/development/tools/generate_manuals_for_web.sh
+++ b/development/tools/generate_manuals_for_web.sh
@@ -18,8 +18,7 @@
  #   $TOC - final index.html that links all converted manuals
  #   $TMP - temporary folder where all the conversion is done
  
-#MAIN_DOCS=${MAIN_DOCS:-"Intro Tutorial UserGuide Math Additional Customization Shortcuts LFUNs"}

-MAIN_DOCS=${MAIN_DOCS:-"Math"}
+MAIN_DOCS=${MAIN_DOCS:-"Intro Tutorial UserGuide Math Additional Customization 
Shortcuts LFUNs"}
  LYX=${LYX:-${PWD}/src/lyx}
  OUT=${OUT:-$HOME/web/lyxdoc}
  TOC=${TOC:-lyxdoc/index.html}