From 2fcf73e0d522e88e99813c84ac1c07f8a83b1e77 Mon Sep 17 00:00:00 2001 From: dieter-wilhelm Date: Fri, 17 Apr 2020 10:57:04 +0200 Subject: [PATCH] Correct usage of #+texinfo lines Remove forgotten merge cookies in README.org. --- README.md | 49 +++++++++++++---------------- apdl-mode.info | 75 ++++++++++++++++++++++---------------------- helper/makefile | 5 ++- info/README.org | 6 +--- info/TODO.md | 35 +++++++++++---------- info/TODO.org | 13 ++++---- info/apdl-config.md | 42 ++++++++++++------------- info/apdl-config.org | 7 ++--- info/usage.org | 2 +- 9 files changed, 115 insertions(+), 119 deletions(-) diff --git a/README.md b/README.md index 6b56756..5a4cb0d 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,18 @@ # Table of Contents -1. [Introduction](#orgbd9565b) -2. [Some Highlights](#orgf16524e) -3. [Installation](#orge3a00cd) -4. [First Steps](#org659e9c6) -5. [Configuration and Customisation](#org45ecbff) -6. [Bugs and Problems](#org9cb11c3) -7. [News](#org9d695a5) -8. [Further Resources](#orgbd11703) -9. [Acknowledgements](#org7655699) -10. [Todos](#orgf92af26) -11. [GNU GPL v3 License](#org2f6d750) +1. [Introduction](#org0a6416f) +2. [Some Highlights](#org3fde12c) +3. [Installation](#org2947558) +4. [First Steps](#org4020323) +5. [Configuration and Customisation](#orgc049613) +6. [Bugs and Problems](#org3cbb95d) +7. [News](#org79e866e) +8. [Further Resources](#org05c3c52) +9. [Acknowledgements](#orgbf65e9b) +10. [Todos](#org02e166b) +11. [GNU GPL v3 License](#org2431fc1) -<<<<<<< HEAD - -`=====` - ->>>>>>> help ## The GNU-Emacs major mode for the scripting language APDL @@ -32,7 +27,7 @@ Copyright (C) 2006 - 2020 H. Dieter Wilhelm, GPL V3 ![img](doc/ansys+emacs2020-03.png) - + # Introduction @@ -75,7 +70,7 @@ with the "Refresh" button. ![img](doc/connect_command_snippet_to_file.png) - + # Some Highlights @@ -141,7 +136,7 @@ The image below shows the unhidden content. ![img](doc/unhidden_blocks.png) - + # Installation @@ -209,7 +204,7 @@ to your initialisation file (the source directory must be set in the \`load-path' variable as well). - + # First Steps @@ -228,7 +223,7 @@ APDL-Mode is tested with Ansys v193 and v201 under Windows 10, as well as under Emacs-25 and 26 under GNU-Linux and Windows. - + # Configuration and Customisation @@ -244,7 +239,7 @@ Please read the [apdl-config](info/apdl-config.md) documentation for further opt open the accompanying configuration [example-file](info/apdl-config.el). - + # Bugs and Problems @@ -265,14 +260,14 @@ following options: [Emacs Wiki](https://www.emacswiki.org). - + # News For further news please have a look into the [NEWS](info/NEWS.md) file. - + # Further Resources @@ -280,7 +275,7 @@ If you want to read further details regarding the APDL scripting, GNU-Emacs and other APDL editors please read the [RESOURCES](info/resources.md) file. - + # Acknowledgements @@ -295,14 +290,14 @@ I received moreover support and feedback from many individuals, thank you very much! - + # Todos Please check the [TODO](info/TODO.md) file. - + # GNU GPL v3 License diff --git a/apdl-mode.info b/apdl-mode.info index d2eeb95..7a22a25 100644 --- a/apdl-mode.info +++ b/apdl-mode.info @@ -3169,6 +3169,7 @@ File: apdl-mode.info, Node: Todos bugs, Next: Minor bugs, Up: Version 2050 1 12.1.1 Todos, bugs ------------------ + • Make text around #+texinfo: lines self sustained! • Templates: Add intro help to the -wb-template system, complete usage.org • Code Templates, apdl-wb-custom-template-directory @@ -3180,13 +3181,13 @@ File: apdl-mode.info, Node: Minor bugs, Next: Checks, Prev: Todos bugs, Up: 12.1.2 Minor bugs ----------------- - • C-c C-v doesn’t preserve point of macro file + • C-c C-v doesn’t preserve point of the APDL file • M-? parameter counter is not working for commands where functions with multiple arguments are in the argument list! f,node(x,y,z),,, - • C-u C-c C-b in browser on Win10 for "All"stuff isn’t skipping to - the respective section on page for Chrome and Edge!? • ‘1/en’, en is variable but this fraction is not fontified, though ‘1/ en’ is fontified! + • C-u C-c C-b in browser on Win10 for "All"stuff isn’t skipping to + the respective section on page for Chrome and Edge!?  File: apdl-mode.info, Node: Checks, Next: Wishes, Prev: Minor bugs, Up: Version 2050 1 @@ -3242,7 +3243,8 @@ File: apdl-mode.info, Node: Docu, Next: templates, Up: Wishes • work on the Info index • #+include: #+title adds to info title! - • #+texinfo: @inforef{node,name,file} links to Emacs info pages, done + • #+texinfo: @inforef{node,name,file} links to Emacs info pages, + done, make contex self sustained!! • Attention colon ":" in headline gives a texinfo reference! • C-u C-h i: info file :-) • package with file "dir" @@ -3336,8 +3338,7 @@ makefile? apdl-customise-ansys - (tags-query-replace "26\.3" "27.1") (tags-search "((emacs -\"25.1\"))") + (tags-query-replace "26\.3" "27.1") (tags-search "texinfo:")  File: apdl-mode.info, Node: Version 2040 1, Next: Version 2030 1, Prev: Version 2050 1, Up: Todos @@ -4549,37 +4550,37 @@ Node: Other APDL editor resources130072 Node: Todos130986 Node: Version 2050 1131302 Node: Todos bugs131633 -Node: Minor bugs131960 -Node: Checks132537 -Node: Wishes132820 -Node: Docu133124 -Node: templates134966 -Node: misc135563 -Node: Done135974 -Node: Push and Release Proceedures136213 -Node: Version 2040 1137139 -Node: Version 2030 1137336 -Node: Version 2020 1137554 -Node: Version 2011 1137733 -Node: Version 162-2138205 -Node: Bugs138481 -Node: Freeze139450 -Node: Wish-list139807 -Node: Deficiencies145923 -Node: Procedures147584 -Node: Freeze proceedures148106 -Node: Release149633 -Node: Ideas for further versions150236 -Node: Parameter help and documentation150665 -Node: Ansys process and interpreter buffer152967 -Node: Skeletons outline and abbrevs155830 -Node: Miscellaneous 1157562 -Node: Ansys syntax restrictions not (yet) accounted for162552 -Node: Unknown Ansys stuff163455 -Node: Acknowledgements163738 -Node: GNU Free Documentation License164308 -Node: Variable Index189334 -Node: Concept Index189483 +Node: Minor bugs132017 +Node: Checks132597 +Node: Wishes132880 +Node: Docu133184 +Node: templates135061 +Node: misc135658 +Node: Done136069 +Node: Push and Release Proceedures136308 +Node: Version 2040 1137224 +Node: Version 2030 1137421 +Node: Version 2020 1137639 +Node: Version 2011 1137818 +Node: Version 162-2138290 +Node: Bugs138566 +Node: Freeze139535 +Node: Wish-list139892 +Node: Deficiencies146008 +Node: Procedures147669 +Node: Freeze proceedures148191 +Node: Release149718 +Node: Ideas for further versions150321 +Node: Parameter help and documentation150750 +Node: Ansys process and interpreter buffer153052 +Node: Skeletons outline and abbrevs155915 +Node: Miscellaneous 1157647 +Node: Ansys syntax restrictions not (yet) accounted for162637 +Node: Unknown Ansys stuff163540 +Node: Acknowledgements163823 +Node: GNU Free Documentation License164393 +Node: Variable Index189419 +Node: Concept Index189568  End Tag Table diff --git a/helper/makefile b/helper/makefile index 407dc22..be08174 100644 --- a/helper/makefile +++ b/helper/makefile @@ -109,7 +109,10 @@ ELC : $(ELC_FILES) # interesting files besides the essential lisp files FILES := ../info/LICENSE ../apdl-mode-readme.txt ../info/README.org \ ../info/TODO.org ../info/NEWS.org ../info/INSTALLATION.org \ - ../info/apdl-config.org ../info/apdl-config.el ../info/apdl-mode.info + ../info/apdl-config.org ../info/apdl-mode.org \ + ../info/acknowledgements.org ../info/bugs.org ../info/first_steps.org \ + ../info/introduction.org ../info/resources.org ../info/tutorial.org \ + ../info/usage.org # all org files which are referenced in README.org have to be exported # to markdown .md diff --git a/info/README.org b/info/README.org index c4dd3da..5f8f0c2 100644 --- a/info/README.org +++ b/info/README.org @@ -1,9 +1,5 @@ #+STARTUP: all -<<<<<<< HEAD -#+DATE: Time-stamp: <2020-04-14> -======= -#+DATE: Time-stamp: <2020-04-15> ->>>>>>> help +#+DATE: Time-stamp: <2020-04-17> #+bind: org-html-preamble-format (("en" "%d")) #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline #+OPTIONS: author:t c:t creator:t d:(not "LOGBOOK") date:t diff --git a/info/TODO.md b/info/TODO.md index f2ae2f4..c0c8814 100644 --- a/info/TODO.md +++ b/info/TODO.md @@ -1,16 +1,16 @@ # Table of Contents -1. [Version 20.5.0](#org1750184) -2. [Version 20.4.0](#org8271fec) -3. [Version 20.3.0](#orgb02a203) -4. [Version 20.2.0](#org2183efc) -5. [Version 20.1.1](#org3206a09) -6. [Version 162-2](#org05c64f8) +1. [Version 20.5.0](#orgc7e6dfb) +2. [Version 20.4.0](#org0568e68) +3. [Version 20.3.0](#org7f7b1e7) +4. [Version 20.2.0](#orgf14e810) +5. [Version 20.1.1](#orgda94e20) +6. [Version 162-2](#org9332efd) - + # TODO Version 20.5.0 @@ -20,6 +20,7 @@ help for all get- and parametric-functions ## Todos, bugs +- Make text around #+texinfo: lines self sustained! - Templates: Add intro help to the -wb-template system, complete usage.org - Code Templates, apdl-wb-custom-template-directory @@ -28,14 +29,14 @@ help for all get- and parametric-functions ## Minor bugs -- C-c C-v doesn't preserve point of macro file +- C-c C-v doesn't preserve point of the APDL file - M-? parameter counter is not working for commands where functions with multiple arguments are in the argument list! f,node(x,y,z),,, -- C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to - the respective section on page for Chrome and Edge!? - \`1/en', en is variable but this fraction is not fontified, though \`1/ en' is fontified! +- C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to + the respective section on page for Chrome and Edge!? ## Checks @@ -87,7 +88,7 @@ Info documentation: - work on the Info index - \#+include: #+title adds to info title! - \#+texinfo: @inforef{node,name,file} links to Emacs info pages, - done + done, make contex self sustained!! - Attention colon ":" in headline gives a texinfo reference! - C-u C-h i: info file :-) - package with file "dir" @@ -177,10 +178,10 @@ APDLPATCH := 0 apdl-customise-ansys (tags-query-replace "26\\.3" "27.1") -(tags-search "((emacs \\"25.1\\"))") +(tags-search "texinfo:") - + # DONE Version 20.4.0 @@ -188,7 +189,7 @@ apdl-customise-ansys updated to 2020R1 - + # DONE Version 20.3.0 @@ -197,14 +198,14 @@ Melpa feature freeze [2020-03-20 Fr] - + # DONE Version 20.2.0 [2020-03-10 Di] - + # DONE Version 20.1.1 @@ -217,7 +218,7 @@ feature freeze [2020-03- - bug-report about package.el "NAME-readme.txt", done - + # Version 162-2 diff --git a/info/TODO.org b/info/TODO.org index 54bee54..29b529c 100644 --- a/info/TODO.org +++ b/info/TODO.org @@ -1,4 +1,4 @@ -#+DATE: Time-stamp: <2020-04-16> +#+DATE: Time-stamp: <2020-04-17> #+bind: org-html-preamble-format (("en" "%d")) #+OPTIONS: html-link-use-abs-url:nil html-postamble:t html-preamble:t #+OPTIONS: html-scripts:t html-style:t html5-fancy:nil tex:t @@ -22,19 +22,20 @@ [2020-04-16 Do] feature freeze help for all get- and parametric-functions ** Todos, bugs + - Make text around #+texinfo: lines self sustained! - Templates: Add intro help to the -wb-template system, complete usage.org - Code Templates, apdl-wb-custom-template-directory - Export of WB command objects to file on disc ** Minor bugs - - C-c C-v doesn't preserve point of macro file + - C-c C-v doesn't preserve point of the APDL file - M-? parameter counter is not working for commands where functions with multiple arguments are in the argument list! f,node(x,y,z),,, - - C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to - the respective section on page for Chrome and Edge!? - `1/en', en is variable but this fraction is not fontified, though `1/ en' is fontified! + - C-u C-c C-b in browser on Win10 for "All"stuff isn't skipping to + the respective section on page for Chrome and Edge!? ** Checks - EWW bug: not working with remote ssh -help-path (debbugs-gnu-bugs 40425) @@ -77,7 +78,7 @@ - work on the Info index - #+include: #+title adds to info title! - #+texinfo: @inforef{node,name,file} links to Emacs info pages, - done + done, make contex self sustained!! - Attention colon ":" in headline gives a texinfo reference! - C-u C-h i: info file :-) - package with file "dir" @@ -154,7 +155,7 @@ apdl-customise-ansys # emacs (tags-query-replace "26\.3" "27.1") - (tags-search "((emacs \"25.1\"))") + (tags-search "texinfo:") * DONE Version 20.4.0 [2020-04-01 Mi] diff --git a/info/apdl-config.md b/info/apdl-config.md index a917979..d9209ac 100644 --- a/info/apdl-config.md +++ b/info/apdl-config.md @@ -1,15 +1,15 @@ # Table of Contents -1. [Conventions](#orgff05838) -2. [Important Prerequisite](#org0fbd87f) -3. [File suffixes](#org836cdc8) -4. [Auto insertion](#org5334f3d) -5. [Miscellaneous](#org8e9b5c5) -6. [Outlining](#org5ab58d0) -7. [Highlighting (Colourisation)](#org2ef7597) -8. [Installation dependent configurations](#org09e938e) -9. [Ansys processes](#org0b1b0c9) +1. [Conventions](#org341c737) +2. [Important Prerequisite](#org6c90aac) +3. [File suffixes](#org41bf3fc) +4. [Auto insertion](#org8f66033) +5. [Miscellaneous](#org5e9059c) +6. [Outlining](#orgfc56750) +7. [Highlighting (Colourisation)](#orgae87da2) +8. [Installation dependent configurations](#org5465fa6) +9. [Ansys processes](#org1817f92) Most functionality of APDL-Mode is working without additional configurations. APDL-Mode is intelligent enough to figure out Ansys @@ -20,9 +20,9 @@ APDL-Mode configures GNU-Emacs to open all files with the suffixes ".mac", ".dat" and ".inp" under apdl-mode. You can change the APDL-Mode confgurations permanently by 1. using the -Emacs customistation system - +Emacs customistation system -or 2. by directly manipulating the Emacs configuration file - +or 2. by directly manipulating the Emacs configuration file 1. For an overview of available APDL-Mode customisations variables it’s easiest to open the APDL-Mode’s customisation buffer either @@ -44,7 +44,7 @@ or 2. by directly manipulating the Emacs configuration file - is `;` (one semi-colon \`;'). - + # Conventions @@ -58,7 +58,7 @@ or load your adjustments of this file with \`(load-file "PATH/apdl-config.el")' from your init file. - + # Important Prerequisite @@ -83,11 +83,11 @@ the MAPDL menu entry "Change Installation Directory". If your Ansys installation differs completely from the standard Ansys directory structure, or you want to use multiple versions of -Ansys, then please consult the section [Installation dependent configurations](#org09e938e) +Ansys, then please consult the section [Installation dependent configurations](#org5465fa6) below. - + # File suffixes @@ -158,7 +158,7 @@ imports, see the file *example.anf* in the *doc* folder. (add-to-list 'auto-mode-alist '("\\.anf$" . apdl-mode)) - + # Auto insertion @@ -180,7 +180,7 @@ section). '(apdl-mode . [apdl-skeleton-outline-template])) ;which template to insert - + # Miscellaneous @@ -214,7 +214,7 @@ section). (setq apdl-username "userID") ; new in 20.4.0 - + # Outlining @@ -230,7 +230,7 @@ code sections: (add-hook 'apdl-mode-hook 'apdl-outline-minor-mode) ;enable outlining - + # Highlighting (Colourisation) @@ -283,7 +283,7 @@ the current default is 2. (setq apdl-highlighting-level 1) ; default: 2 - + # Installation dependent configurations @@ -313,7 +313,7 @@ path, or if you want to mix various Ansys versions: (setq apdl-lmutil-program "/appl/ansys_inc/19.3.0/shared_files/licensing/linx64/lmutil") - + # Ansys processes diff --git a/info/apdl-config.org b/info/apdl-config.org index 90ab0f5..5892a01 100644 --- a/info/apdl-config.org +++ b/info/apdl-config.org @@ -1,4 +1,4 @@ -#+DATE: Time-stamp: <2020-04-15> +#+DATE: Time-stamp: <2020-04-17> #+bind: org-html-preamble-format (("en" "%d")) #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:{} arch:headline #+OPTIONS: author:t c:nil creator:comment d:(not "LOGBOOK") date:t @@ -34,12 +34,11 @@ APDL-Mode configures GNU-Emacs to open all files with the suffixes ".mac", ".dat" and ".inp" under apdl-mode. You can change the APDL-Mode confgurations permanently by 1. using the -Emacs customistation system - +Emacs customistation system #+texinfo: @inforef{Easy Customization,,emacs} -or 2. by directly manipulating the Emacs configuration file - +or 2. by directly manipulating the Emacs configuration file #+texinfo: @inforef{Init File,,emacs}. - 1. For an overview of available APDL-Mode customisations variables it’s easiest to open the APDL-Mode’s customisation buffer either with the command ‘M-x apdl-customise-apdl’ or from the menu bar diff --git a/info/usage.org b/info/usage.org index 6e4daa8..5544403 100644 --- a/info/usage.org +++ b/info/usage.org @@ -131,7 +131,7 @@ use the menu entry "List Mode Abbbreviations" or the command ‘M-x list-abbrevs ’ to inspect all definitions. - You can define your own abbreviations, please + In Emacs you can define your own abbreviations. #+texinfo: @inforef{Abbrev Concepts,,emacs}. ** Auto-indentation