Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: More clean-ups (smoe:docs_man_adoc_20240813-2) #3110

Merged
merged 7 commits into from
Oct 4, 2024

Conversation

smoe
Copy link
Contributor

@smoe smoe commented Sep 12, 2024

I took my local version of the #3066 and rebased it against master. Added another patch to remove empty blanks at the end of lines. Now looks clean, no exact idea what I did differently.

@petterreinholdtsen , @hansu , Please kindly review this one and then I see what I can do to save what is still important n #3066 .

Many thanks,
Steffen

@smoe
Copy link
Contributor Author

smoe commented Sep 12, 2024

The error is not caused by this PR:

Skipping disabled test: /home/runner/work/linuxcnc/linuxcnc/tests/save.1
Running test: /home/runner/work/linuxcnc/linuxcnc/tests/single-step
*** /home/runner/work/linuxcnc/linuxcnc/tests/single-step: XFAIL: test run exited with 1
************** result:
        Machine configuration file is 'test.ini'
        Starting LinuxCNC...
        linuxcncsvr (169910) emcsvr: machine 'unknown'  version '1.1'
        linuxcnc TPMOD=tpmod HOMEMOD=homemod EMCMOT=motmod
        milltask (169923) task: machine 'unknown'  version '1.1'
        emc/task/taskclass.cc 187: can't load tool table.
        Found file(LIB): /home/runner/work/linuxcnc/linuxcnc/lib/hallib/core_sim.hal
        USRMOT: ERROR: command 30 timeout
        emcMotionInit: emcTrajInit failed
        task: main loop took 0.018239 seconds
        task: main loop took 0.019244 seconds
        Shutting down and cleaning up LinuxCNC...
        task: 0 cycles, min=0.000004, max=0.019244, avg=-1.000000, 2 latency excursions (> 10x expected cycle time of 0.001000s)
        LinuxCNC terminated with an error.  You can find more information in the log:
            /home/runner/linuxcnc_debug.txt
        and
            /home/runner/linuxcnc_print.txt
        as well as in the output of the shell command 'dmesg' and in the terminal
************** stderr:
        + linuxcnc -r test.ini
        Note: Using POSIX non-realtime
        emc/tooldata/tooldata_common.cc, 304: Failed to open tool table file 'simpockets.tbl': No such file or directory
        emc/tooldata/tooldata_common.cc, 304: Failed to open tool table file 'simpockets.tbl': No such file or directory
        link (updating variable file): No such file or directory
        timeout in wait_complete_step()
        Note: Using POSIX non-realtime
**************
Running test: /home/runner/work/linuxcnc/linuxcnc/tests/source.0

@petterreinholdtsen
Copy link
Collaborator

petterreinholdtsen commented Sep 13, 2024 via email

@smoe smoe changed the title Docs man adoc 20240813 2 docs: More clean-ups (smoe:docs_man_adoc_20240813-2) Sep 18, 2024
@smoe
Copy link
Contributor Author

smoe commented Sep 26, 2024

@hansu , may I ask you? Should not be too bad.

Copy link
Member

@hansu hansu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is CMS_buffer.eps?

Please also remove the asterisks from linuxcncrsh.1.adoc:58 while you are at it :)

To use linuxcncrsh instead of a normal LinuxCNC GUI like AXIS or Touchy,
specify it in your INI file like this:

----
-*[DISPLAY]*
+[DISPLAY]

-*DISPLAY=linuxcncrsh*
+DISPLAY=linuxcncrsh
----

@@ -122,7 +122,7 @@ gscreen-gaxis has a sample custom theme that looks for certain named widgets and
The Estop and machine-on buttons use different colors then the rest of the buttons so that they stand out.
This is done in the handler file by giving them specific names an by adding specific commands in the theme's gtkrc file.
For some info on GTK theming (The sample theme uses the pixmap theme engine), see:
https://wiki.gnome.org/Attic/GnomeArt/Tutorials/GtkThemes[GTK Themes],
https://wiki.gnome.org/Attic/GnomeArt/Tutorials/GtkThemes[GTK Themes],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This space should stay

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is still remaining

docs/src/code/building-linuxcnc.adoc Outdated Show resolved Hide resolved
docs/src/man/man1/linuxcncrsh.1.adoc Show resolved Hide resolved
@smoe
Copy link
Contributor Author

smoe commented Sep 27, 2024

What is CMS_buffer.eps

It is the DIA (https://en.wikipedia.org/wiki/Dia_(software))-generated post script from which https://github.com/LinuxCNC/linuxcnc/blob/master/docs/src/code/CMS_buffer.png is derived. The EPS file itself is not used.

@smoe
Copy link
Contributor Author

smoe commented Sep 27, 2024

Looking at the bad quality of the PNG, it may be worthwhile to have a second look at my idea to remove the EPS.

@andypugh
Copy link
Collaborator

Would changing the EPS to an SVG work? (Do our tools display SVG? Web browsers display them by default)

@smoe
Copy link
Contributor Author

smoe commented Sep 28, 2024

Would changing the EPS to an SVG work?
Yes, nice idea, GIMP can do that, I am sure. Let me provide that alternative - and please also tell me if anything else should be changed in that image at that opportunity :-)

(Do our tools display SVG? Web browsers display them by default)
I do not know, but the PNG I'll make sure to look better.

@smoe smoe marked this pull request as draft September 28, 2024 11:33
@smoe smoe marked this pull request as ready for review September 29, 2024 12:58
@smoe
Copy link
Contributor Author

smoe commented Sep 29, 2024

Would changing the EPS to an SVG work? (Do our tools display SVG? Web browsers display them by default)
The SVG looks nice in inkscape and the PNG is also refreshed.
Have rebased to master, have addressed all of Hansu's changes, except for the one still disputed newline one :-) , and added some more lines on the introduction of linuxcncrsh.1 (feeling that tool to be a bit underrated).

@smoe
Copy link
Contributor Author

smoe commented Sep 30, 2024

The error in debian:bookworm is triggered by the tests:

Running test: ./tests/single-step
*** ./tests/single-step: XFAIL: test run exited with 1
************** result:
        Machine configuration file is 'test.ini'
        Starting LinuxCNC...
        linuxcncsvr (224663) emcsvr: machine 'unknown'  version '1.1'
        linuxcnc TPMOD=tpmod HOMEMOD=homemod EMCMOT=motmod
        milltask (224675) task: machine 'unknown'  version '1.1'
        emc/task/taskclass.cc 187: can't load tool table.
        Found file(LIB): /usr/share/linuxcnc/hallib/core_sim.hal
        USRMOT: ERROR: command 30 timeout
        emcMotionInit: emcTrajInit failed
        task: main loop took 0.018326 seconds
        task: main loop took 0.018875 seconds
        Shutting down and cleaning up LinuxCNC...
        task: 0 cycles, min=0.000004, max=0.018875, avg=-1.000000, 2 latency excursions (> 10x expected cycle time of 0.001000s)
        LinuxCNC terminated with an error.  You can find more information in the log:
            /home/testrunner/linuxcnc_debug.txt
        and
            /home/testrunner/linuxcnc_print.txt
        as well as in the output of the shell command 'dmesg' and in the terminal
************** stderr:
        + linuxcnc -r test.ini
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        Note: Using POSIX non-realtime
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        emc/tooldata/tooldata_common.cc, 304: Failed to open tool table file 'simpockets.tbl': No such file or directory
        emc/tooldata/tooldata_common.cc, 304: Failed to open tool table file 'simpockets.tbl': No such file or directory
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
        link (updating variable file): No such file or directory
        line=7; Xpos=5.00; Ypos=0.12; Zpos=0.00; counter=0

Tend to think that this PR is not triggering this.

@smoe
Copy link
Contributor Author

smoe commented Oct 3, 2024

@hansu, this patch needs to build and thus I want to push something else that is somehow trivial but useful. Concerning that blank that you wanted to be added back in, is this still a thing? I truly think that it would be wrong to add, and since I am likely to make that mistake (if any) again with the upcoming changes, please kindly explain what your concern is.

@hansu
Copy link
Member

hansu commented Oct 4, 2024

Simply look here: https://linuxcnc.org/docs/devel/html/gui/gscreen.html#_overview

This

For some info on GTK theming (The sample theme uses the pixmap theme engine), see: GTK Themes, Pixmap Theme Engine.
2.2. Build a GladeVCP Panel

would turn into

For some info on GTK theming (The sample theme uses the pixmap theme engine), see: GTK Themes,Pixmap Theme Engine.
2.2. Build a GladeVCP Panel

@smoe
Copy link
Contributor Author

smoe commented Oct 4, 2024

Simply look here: https://linuxcnc.org/docs/devel/html/gui/gscreen.html#_overview

This

For some info on GTK theming (The sample theme uses the pixmap theme engine), see: GTK Themes, Pixmap Theme Engine.
2.2. Build a GladeVCP Panel

would turn into

For some info on GTK theming (The sample theme uses the pixmap theme engine), see: GTK Themes,Pixmap Theme Engine.
2.2. Build a GladeVCP Panel

No, it would not? I mean, have you seen that happening? Definitely does not happen in the vscode preview. The patch intends to remove the blank that is still followed by a newline, not also the newline. We have lines ending with commas or periods all the time that have proper white space following in the HTML/pdf. I yet fail to see (and would want to understand) why is this now special.

?´+ü´[ <- baby-cat just contributed some extra characters ]

If you do not ultimately mind, please just accept the patch. I'll make a $100 donation to FreeCAD if there is no white space in the PDF after that comma ... and likely spend the rest of the year to find the bug in the autodoc parser.

@hansu
Copy link
Member

hansu commented Oct 4, 2024

No, it would not?

You are right, sorry. I missed the line break and thought just Github editor did the line break 😇
However I still would not trust the VSCode preview as it targets on asciidoctor not asciidoc-py and differs in some border cases.

@hansu hansu merged commit bbabfab into LinuxCNC:master Oct 4, 2024
9 checks passed
@smoe smoe deleted the docs_man_adoc_20240813-2 branch October 4, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants