labrat 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb6a8e4afc8a5d258a6e62936df099cfd3d14aa0cc538c3ea0e505640999c08
-  data.tar.gz: f99873b21e534ce721332491557be580d51c9b85431236fe3eac35e866e11e9f
+  metadata.gz: 33cfd23bc08f69e0f9147329ae77a91de45458ec613431c258608fc00a175e26
+  data.tar.gz: 92a47e9f6eb8e4f807591664ac1188a59856e000c5c0018bca901fb72ac08253
 SHA512:
-  metadata.gz: dad638049b53df861e9511308ebd27552681c1fd4fbb9e69ab5926db7a99f66e9c4248cc6d8fef3e9787c09c502f95ecd42dca54908f003a8d9eecf0bf0ee7d9
-  data.tar.gz: 2a903b57e3f2ba0ac02122b38c84e45de01b30d447617f8966f573c1ffe7dc2756f2bb5548f222341c575dffa78b8ca931ef435991bc0f2ae154f4c211e6a373
+  metadata.gz: e4e6e36bbc4d26531f5358f71f2e2ad43b10b67e692c9be1f7d5cd0a07f5a8ca9f02a714cd594e91bfe8703f84f68c37aa32f15765a861452a03ab6820675a1f
+  data.tar.gz: d43a0befaf67f7365d9aa7b049a555c4dacf75d2c7d5f0755047fd4adb828cb7c2781a0822d86b439ab35c34c1a9f4d7cf163545b9a1c028687dfb3c65bec360

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    labrat (1.0.0)
+    labrat (1.2.0)
       activesupport
       fat_core
       matrix

data/README.org

@@ -59,7 +59,7 @@ wonderful [[https://github.com/prawnpdf/prawn][Prawn gem]] to generate PDF files
 =labrat= properly configured, printing a label is as simple as:
 
 #+begin_example
-$ labrat 'Income Taxes 2021-->Example Maker, Inc.'
+$ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 #+end_example
 
 And you will get a two-line file-folder label printed that looks like this:
@@ -85,14 +85,14 @@ without success, I decided to write my own.  Hence labrat.  With it---after
 due configuration---printing a file folder label is as simple as:
 
 #+begin_src sh
-  $ labrat 'First Line of Label-->And the Second Line'
+  $ labrat 'First Line of Label ~~ And the Second Line'
   #+end_src
 
 Or, you can preview the label in your previewer of choice (mine is qpdfview)
 by adding the -V flag:
 
 #+begin_src sh
-  $ labrat -V 'First Line of Label-->And the Second Line'
+  $ labrat -V 'First Line of Label ~~ And the Second Line'
   #+end_src
 
 Even better, I have included with =labrat= an elisp file (=labrat.el=) that
@@ -346,10 +346,10 @@ later pages always start on the first label position.
 
 *** New line marker
 You can embed a special text-sequence in the label text to indicate where a
-line-break should occur.  By default it is the sequence =-->=.  This means
-that =labrat= will translate all occurrences of =-->= in the text into a
+line-break should occur.  By default it is the sequence = ~~ =.  This means
+that =labrat= will translate all occurrences of = ~~ = in the text into a
 line-break, even consecutive occurrences.  There is no way to escape this in
-the text, so if you want labels for that use '-->' as part of the text, you
+the text, so if you want labels for that use ' ~~ ' as part of the text, you
 are going to have difficulty printing a labels.  But you can change the marker
 to something else with ~--nlsep~.  This is especially helpful when you are
 using the command-line to supply the label text since specifying line-breaks
@@ -357,16 +357,16 @@ on a shell command can be difficult.  However note that this substitution
 takes place even when reading label texts from a file or standard input.
 
 - ~-n~, ~--nlsep=SEPARATOR~ :: Specify text to be translated into a line-break
-  (default '-->')
+  (default ' ~~ ')
 
 *** Label separator
 The only way to print more than one label from the command-line is to indicate
 where one label ends and the next begins with a special marker in the
-command-line arguments, by default the string '==>'.  The text used for this
+command-line arguments, by default the string '@@'.  The text used for this
 can be customized with this option.
 
 - ~--label-sep=SEPARATOR~ :: Specify text that indicates the start of a new
-  label (default '==>')
+  label (default '@@')
 
 *** Number of copies
 This option causes =labrat= to generate multiple copies of each label with all
@@ -388,11 +388,11 @@ on the command-line.  It combines all the non-option arguments and joins them
 with a space between each argument.  For example,
 
 #+begin_example
-$ labrat -c3 This is a 'single label' '-->composed of all this' text --font-style=italic
+$ labrat -c3 This is a 'single label' ' ~~ composed of all this' text --font-style=italic
 #+end_example
 
 prints three copies of a single label in italics with two lines, breaking at
-the '-->' marker, resulting in something like this:
+the ' ~~ ' marker, resulting in something like this:
 
 #+begin_example
 This is a single label
@@ -401,12 +401,12 @@ composed of all this text
 
 Note that when the label text is specified on the command-line, ~labrat~ just
 prints a single label.  The only ways to get multiple labels is by (1) marking
-a separation between labels with the ~--label-sep~ marker ('==>' by default)
+a separation between labels with the ~--label-sep~ marker ('@@' by default)
 or (2) using the ~-c~ (~--copies~) argument to get multiple copies of the
 label text.  These options can be combined as well.  For example,
 
 #+begin_example
-$ labrat -c3 This is the 'first label' ==> 'And the rest --> is the second' text --font-style=italic
+$ labrat -c3 This is the 'first label' @@ 'And the rest  ~~  is the second' text --font-style=italic
 #+end_example
 
 will produce three copies of two separate labels:
@@ -572,7 +572,7 @@ $ labrat -T -V --label=avery8987
 
 And if you want to see it with sample label text filled in, try the following:
 #+begin_example
-$ labrat -V -c30 --label=avery8987 'Four score and seven years ago-->Our fathers brought forth'
+$ labrat -V -c30 --label=avery8987 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 *** Nesting label definitions
@@ -608,7 +608,7 @@ badge:
 
 With this, you can print a file folder label with:
 #+begin_example
-$ labrat --label=ff 'Four score and seven years ago-->Our fathers brought forth'
+$ labrat --label=ff 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 And, if you want this to be your default label type, you can add to your user-level
@@ -620,13 +620,13 @@ label:
 
 Now you can print the label without the ~--label~ option on the command-line:
 #+begin_example
-$ labrat 'Four score and seven years ago-->Our fathers brought forth'
+$ labrat 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 If you want to print badges, you have to specify the ~--label~ option explicitly on
 the command-line:
 #+begin_example
-$ labrat -V -c14 --label=badge 'Daniel E. Doherty-->(Amateur Programmer)'
+$ labrat -V -c14 --label=badge 'Daniel E. Doherty ~~ (Amateur Programmer)'
 #+end_example
 
 *** A Caution about option order
@@ -636,7 +636,7 @@ override earlier settings.  For example, given the configuration above, where
 ~ff~ is your default label type, the following will not do what you expect:
 
 #+begin_example
-$ labrat --font-style=italic --label=ff 'Four score and seven years ago-->Our fathers brought forth'
+$ labrat --font-style=italic --label=ff 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 You expect the label to be printed in italic, but the ~--label=ff~ option in
@@ -647,7 +647,7 @@ namely ~--font-style=bold~ from the user-level label database.
 To get this to work, you have to put the command-line setting after the
 ~--label=ff~ option in order for it to take effect:
 #+begin_example
-$ labrat --label=ff --font-style=italic 'Four score and seven years ago-->Our fathers brought forth'
+$ labrat --label=ff --font-style=italic 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 * Development

data/labrat.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     the wonderful Prawn gem to generate PDF files with label formatting in mind. With
     labrat properly configured, printing a label is as simple as:
 
-    $ labrat 'Income Taxes 2021-->Example Maker, Inc.'
+    $ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 
     And you will get a two-line file-folder label with the text centered. It can
     print on dymo label printer rolls or Avery sheet labels.  It knows the layout of

data/lib/config_files/config.yml

@@ -93,7 +93,7 @@
 # A string sequence that is interpreted as a line-break can be defined.  Such
 # a sequence is particularly helpful when you provide the label text on the
 # command-line, though it will be applied to file-read label texts as well.
-# nlsep: '-->'
+# nlsep: '~~'
 
 # A string sequence that indicates the start of a new label.  Such a sequence
 # is particularly helpful when you provide the label text on the command-line,

data/lib/labrat/arg_parser.rb

@@ -48,7 +48,7 @@ module Labrat
       parser.separator ""
       parser.separator "Print or view (with -V) a label with the given <label-text>."
       parser.separator "All non-option arguments are used for the label text with a special"
-      parser.separator "marker ('-->' by default, see --nlsep) indicating a line-break."
+      parser.separator "marker ('~~' by default, see --nlsep) indicating a line-break."
       parser.separator ""
       parser.separator "Below, NUM indicates an integer, DIM, indicates a linear dimension,"
       parser.separator "valid DIM units are: pt, mm, cm, dm, m, in, ft, yd."
@@ -361,11 +361,11 @@ module Labrat
 
     # On a command-line, specifying where a line-break should occur is not
     # convenient when shell interpretation and quoting rules are taken into
-    # account.  This allows the user to use some distinctive marker ('-->' by
+    # account.  This allows the user to use some distinctive marker ('~~' by
     # default) to designate where a line break should occur.
     def nl_sep_option
       parser.on("-nSEP", "--nl-sep=SEPARATOR",
-                "Specify text to be translated into a line-break (default '-->')") do |nl|
+                "Specify text to be translated into a line-break (default '~~')") do |nl|
         options.nl_sep = nl
         warn "  ::nl-sep <- '#{nl}'::" if options.verbose
       end

data/lib/labrat/options.rb

@@ -50,8 +50,8 @@ module Labrat
       self.font_size = init[:font_size] || 12
       # Input attributes
       self.in_file = init[:in_file] || nil
-      self.nl_sep = init[:nl_sep] || '-->'
-      self.label_sep = init[:label_sep] || '==>'
+      self.nl_sep = init[:nl_sep] || '~~'
+      self.label_sep = init[:label_sep] || '@@'
       self.copies = init[:copies] || 1
       # Output attributes
       self.printer = init[:printer] || ENV['LABRAT_PRINTER'] || ENV['PRINTER'] || 'dymo'

data/lib/labrat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Labrat
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/lisp/labrat.el

@@ -22,7 +22,7 @@ e.g. ~/.rbenv/shims/labrat, for an rbenv ruby installation."
   :type 'string
   :group 'labrat)
 
-(defcustom labrat-nl-sep "-->"
+(defcustom labrat-nl-sep "~~"
   "String to mark newlines in label text.
 
 If you change this, you need to make a corresponding change in your
@@ -30,7 +30,7 @@ labrat configuration at ~/.config/labrat/config.yml."
   :type 'string
   :group 'labrat)
 
-(defcustom labrat-label-sep "==>"
+(defcustom labrat-label-sep "@@"
   "String to mark the separation between labels on the labrat command-line.
 
 If you change this, you need to make a corresponding change in your
@@ -88,7 +88,7 @@ returned"
 This invokes the \"labrat -V\ <label>\" command with the
 paragraph at or before point inserted in the <label> position,
 but with each new-line replaced with the value of the variable
-labrat-nl-sep, '-->' by default."
+labrat-nl-sep, '~~' by default."
   (interactive)
   (call-process labrat-executable nil (get-buffer-create "*labrat*") nil
                 "-V" "-o ~/labrat.pdf""-V --out-file=~/labrat.pdf" (labrat/pars-in-region)))
@@ -99,7 +99,7 @@ labrat-nl-sep, '-->' by default."
 This invokes the \"labrat -P <label>\" command with the paragraph
 at or before point inserted in the <label> position, but with
 each new-line replaced with the value of the variable
-labrat-nl-sep, '-->' by default."
+labrat-nl-sep, '~~' by default."
   (interactive)
   (call-process labrat-executable nil (buffer-name (get-buffer-create "*labrat*")) nil
                 "-o ~/labrat.pdf" (labrat/pars-in-region)))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -184,7 +184,7 @@ description: |2+
   the wonderful Prawn gem to generate PDF files with label formatting in mind. With
   labrat properly configured, printing a label is as simple as:
 
-  $ labrat 'Income Taxes 2021-->Example Maker, Inc.'
+  $ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 
   And you will get a two-line file-folder label with the text centered. It can
   print on dymo label printer rolls or Avery sheet labels.  It knows the layout of
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.2
 signing_key: 
 specification_version: 4
 summary: Command-line and Emacs label print software.